New upstream version 1.1.3+ds1

author Boyuan Yang <byang@debian.org>

Sun, 19 Sep 2021 00:16:41 +0000 (20:16 -0400)

committer Boyuan Yang <byang@debian.org>

Sun, 19 Sep 2021 00:16:41 +0000 (20:16 -0400)
author Boyuan Yang <byang@debian.org>
Sun, 19 Sep 2021 00:16:41 +0000 (20:16 -0400)
committer Boyuan Yang <byang@debian.org>
Sun, 19 Sep 2021 00:16:41 +0000 (20:16 -0400)
diff --git a/.appveyor.yml b/.appveyor.yml

index 5450aeb37ac0442858bc1f7a09f1051de39b2b22..06278bfc2e0b5e5d824252ed4d04d7cda30de38c 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,9 +9,10 @@ environment:
    matrix:
      # Build Node.js
      - nodejs_version: stable
-    - nodejs_version: 13
+    - nodejs_version: 16
+    - nodejs_version: 14
+    - nodejs_version: 12
      - nodejs_version: 10
-    - nodejs_version: 8
  
      # Build plain C++
      - nodejs_version: none
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml

index 702df124312dc13815340afd0e476ad164a29588..a9e30339cd8bb7f48a229a19bbbe5b8198f9ba55 100644 (file)
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -13,7 +13,7 @@ jobs:
  
      strategy:
        matrix:
-        node-version: [10.x, 12.x, 13.x]
+        node-version: [10.x, 12.x, 14.x, 16.x]
  
      steps:
      - uses: actions/checkout@v2
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml

new file mode 100644 (file)

index 0000000..51b393b
--- /dev/null
+++ b/.github/workflows/python.yml
@@ -0,0 +1,37 @@
+name: Python CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  unit-test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest wheel
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --exclude deps --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --exclude deps --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Build and install
+      run: python setup.py build_ext install
+    - name: Test with pytest
+      run: cd python && pytest
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml

deleted file mode 100644 (file)

index 8ef7848..0000000
--- a/.github/workflows/pythonpackage.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Python package
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest wheel
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --exclude deps --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --exclude deps --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Build and install
-      run: python setup.py build_ext install
-    - name: Test with pytest
-      run: cd python && pytest
diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml

new file mode 100644 (file)

index 0000000..27e0b27
--- /dev/null
+++ b/.github/workflows/release-pypi.yml
@@ -0,0 +1,38 @@
+name: Build and upload python package to PyPI
+
+on:
+  workflow_dispatch
+
+jobs:
+  release-pypi:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Build package and upload from docker (Linux)
+      if: runner.os == 'Linux'
+      run: |
+        docker run --rm -v "${PWD}:/opt/OpenCC" \
+          -e TWINE_USERNAME=__token__ \
+          -e TWINE_PASSWORD=${{ secrets.PYPI_TOKEN }} \
+          ubuntu:16.04 /bin/bash /opt/OpenCC/release-pypi-linux.sh
+
+    - name: Build package and upload (macOS)
+      if: runner.os == 'macOS'
+      run: bash release-pypi-macos.sh
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+
+    - name: Build package and upload (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        C:\Miniconda/condabin/conda.bat init powershell
+        ./release-pypi-windows.cmd
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
diff --git a/.npmignore b/.npmignore

index e5ee683168d6c6c3b0f0dcf73cd3f90f710db9ef..50bf6a1ce56dbb280da64f1cb5b05e133ea2af2e 100644 (file)
--- a/.npmignore
+++ b/.npmignore
@@ -17,8 +17,9 @@ CMakeLists.txt
  /doc
  /data/scheme
  /deps/google-benchmark
-/deps/gtest-1.11.0
-/deps/tclap-1.2.2
+/deps/gtest*
+/deps/pybind*
+/deps/tclap*
  /build
  /debug
  /dist
diff --git a/.travis.yml b/.travis.yml

index fa8cfb9ff0b0930b6d8678b4f7350edda7ae9311..c9728ef6815e944aeb97929a529706adeccbb5be 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,25 +6,28 @@ cache:
  
  node_js:
    - stable
-  - 13
+  - 16
+  - 14
+  - 12
    - 10
-  - 8
  
  os:
    - linux
    - osx
  
+arch:
+  - amd64
+  - arm64
+
  addons:
    apt:
      sources:
        - ubuntu-toolchain-r-test
      packages:
        - doxygen
-      - g++-4.8
  
  # Install scripts. (runs after repo cloning)
  install:
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then export CXX=g++-4.8; fi
    # install modules
    - npm install --build-from-source
  
diff --git a/BUILD.md b/BUILD.md

deleted file mode 100644 (file)

index 04202c0..0000000
--- a/BUILD.md
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-# Building Python distributables
-
-This section contain guides to building distributable `.whl` files for the
-purpose of distributing code on the
-[Python Package Index (`PyPI`)](https://pypi.org/).
-
-## Linux
-
-It is highly recommended to generate distributable files using the provided
-`Dockerfile.posix` file.
-This also makes its easy to build from MacOS.
-
-Requirements:
-- [`docker`](https://www.docker.com/) (tested on `v19.03.8`)
-
-```sh
-# Building Docker image
-# Run this from the root directory of this repository
-docker build --rm -t opencc -f python/Dockerfile.posix .
-
-# Mount ./dist and build `.whl` files
-mkdir -p dist
-docker run --rm -it -v $PWD/dist:/opt/OpenCC/dist opencc \
-    bash bdist_array.bash /opt/conda/etc/profile.d/conda.sh
-
-# It might be necessary to change the ownership of files
-sudo chown -R $USER:$USER ./dist
-```
-
-## MacOS
-
-As there are no MacOS docker images, distributable files have to be built
-locally.
-
-Requirements:
-- [xcode](https://developer.apple.com/xcode/)
-- An installation of [conda](https://docs.conda.io/en/latest/)
-  (miniconda or anaconda)
-
-```sh
-# Ensure that miniconda is pre-installed
-# Run this from the root directory of this repository
-# replacing CONDA_INSTALL_DIR
-bash ./bdist_array.bash $CONDA_INSTALL_DIR/etc/profile.d/conda.sh
-```
-
-## Windows
-
-Requirements:
-- Microsoft Visual C++
-- `CMakeTools`
-- An installation of [conda](https://docs.conda.io/en/latest/)
-  (miniconda or anaconda)
-
-> The requirements can be installed using Visual Studio Community Edition
-
-```
-# Ensure that `cmake.exe` and `conda` can all be found in your PATH
-.\bdist_array.cmd
-```
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 08d186a60a98ad04a1df77febc5842845146bce1..07e374591f89863e14bfbdaa67c8cc36e81486c7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,15 +28,21 @@ option(BUILD_SHARED_LIBS "Build opencc as shared library" ON)
  option(ENABLE_GTEST "Build all tests." OFF)
  option(ENABLE_BENCHMARK "Build benchmark tests." OFF)
  option(ENABLE_DARTS "Build DartsDict (ocd format)." ON)
-option(BUILD_BUNDLED_LIBMARISA "" ON)
  option(BUILD_PYTHON "Build python library" OFF)
+option(USE_SYSTEM_DARTS "Use system version of Darts" OFF)
+option(USE_SYSTEM_GOOGLE_BENCHMARK "Use system version of Google Benchmark" OFF)
+option(USE_SYSTEM_GTEST "Use system version of GoogleTest" OFF)
+option(USE_SYSTEM_MARISA "Use system version of Marisa" OFF)
+option(USE_SYSTEM_PYBIND11 "Use system version of pybind11" OFF)
+option(USE_SYSTEM_RAPIDJSON "Use system version of RapidJSON" OFF)
+option(USE_SYSTEM_TCLAP "Use system version of TCLAP" OFF)
  
  ######## Package information
  set (PACKAGE_URL https://github.com/BYVoid/Opencc)
  set (PACKAGE_BUGREPORT https://github.com/BYVoid/Opencc/issues)
  set (OPENCC_VERSION_MAJOR 1)
  set (OPENCC_VERSION_MINOR 1)
-set (OPENCC_VERSION_REVISION 1)
+set (OPENCC_VERSION_REVISION 3)
  
  if (CMAKE_BUILD_TYPE MATCHES Debug)
    set (version_suffix .Debug)
@@ -121,7 +127,7 @@ add_definitions(
  
  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
    add_definitions(
-    -std=c++11
+    -std=c++14
      -Wall
    )
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
@@ -130,7 +136,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
    endif ()
  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    add_definitions(
-    -std=c++0x
+    -std=c++14
      -Wall
    )
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
@@ -173,9 +179,9 @@ endif()
  
  ######## Dependencies
  
-if(BUILD_BUNDLED_LIBMARISA)
+if(NOT USE_SYSTEM_MARISA)
    message(STATUS "Use bundled marisa library.")
-  add_subdirectory(deps/marisa-0.2.5)
+  add_subdirectory(deps/marisa-0.2.6)
  else()
    find_library(LIBMARISA NAMES marisa)
    if (LIBMARISA)
@@ -195,20 +201,28 @@ add_subdirectory(test)
  ######## Testing
  
  if (ENABLE_GTEST)
-  add_subdirectory(deps/gtest-1.11.0)
+  if(NOT USE_SYSTEM_GTEST)
+    add_subdirectory(deps/gtest-1.11.0)
+  endif()
    enable_testing()
  endif()
  
  if (ENABLE_BENCHMARK)
    set(BENCHMARK_ENABLE_TESTING OFF)
-  add_subdirectory(deps/google-benchmark)
+  if(NOT USE_SYSTEM_GOOGLE_BENCHMARK)
+    add_subdirectory(deps/google-benchmark)
+  endif()
    enable_testing()
  endif()
  
  ######## Python
  
  if (BUILD_PYTHON)
-  add_subdirectory(deps/pybind11-2.5.0)
+  if(USE_SYSTEM_PYBIND11)
+    find_package(pybind11 CONFIG)
+  else()
+    add_subdirectory(deps/pybind11-2.5.0)
+  endif()
    pybind11_add_module(opencc_clib src/py_opencc.cpp)
    target_link_libraries(opencc_clib PRIVATE libopencc)
  endif()
diff --git a/NEWS.md b/NEWS.md

index 767b00696fe273669639be8a668ab12ae97f47bd..44c544fb0db077c3136cf679f9aaaba25b8a5569 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,25 @@
  # Change History of OpenCC
  
+## Version 1.1.3
+
+2021年9月3日
+
+* 修復部分頭文件不能單獨使用的問題（#550）。
+* 修復引入系統pybind11的方法（#566）。
+* 支持Node.js 16（#597）。
+* 支持Python 3.9（#603）。
+* 修正轉換錯誤。
+* 若干其他小修復。
+
+## Version 1.1.2
+
+2021年3月2日
+
+* 新增香港繁體轉換。
+* 根據《通用漢字規範表》修正大量簡體異體字轉換。調整臺灣標準，避免過度轉換。
+* 修正編譯兼容性問題，包括並行編譯。
+* 修正1.1.0以來引入的性能嚴重下降問題。
+
  ## Version 1.1.1
  
  2020年5月22日
diff --git a/README.md b/README.md

index d941d6b09ee035f94dda5b2ec09460b70327fc53..4af8d3771ed9c701d7ae760262573b073926f24e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@
  
  [![Travis](https://img.shields.io/travis/BYVoid/OpenCC.svg)](https://travis-ci.org/BYVoid/OpenCC)
  [![AppVeyor](https://img.shields.io/appveyor/ci/Carbo/OpenCC.svg)](https://ci.appveyor.com/project/Carbo/OpenCC)
-[![Python package](https://github.com/BYVoid/OpenCC/workflows/Python%20package/badge.svg?branch=master)](https://github.com/BYVoid/OpenCC/actions?query=workflow%3A%22Python+package%22)
+[![C/C++ CI](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml)
+[![Node.js CI](https://github.com/BYVoid/OpenCC/actions/workflows/nodejs.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/nodejs.yml)
+[![Python CI](https://github.com/BYVoid/OpenCC/actions/workflows/python.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/python.yml)
  
  ## Introduction 介紹
  
@@ -111,7 +113,9 @@ Document 文檔: https://byvoid.github.io/OpenCC/
  * Java: [opencc4j](https://github.com/houbb/opencc4j)
  * Android: [android-opencc](https://github.com/qichuan/android-opencc)
  * PHP: [opencc4php](https://github.com/nauxliu/opencc4php)
+* Pure JavaScript: [opencc-js](https://github.com/nk2028/opencc-js)
  * WebAssembly: [wasm-opencc](https://github.com/oyyd/wasm-opencc)
+* Browser Extension: [opencc-extension](https://github.com/tnychn/opencc-extension)
  
  ### Configurations 配置文件
  
@@ -170,27 +174,30 @@ test.cmd
  make benchmark
  ```
  
-Example results (from Travis CI):
+Example results (from Github CI):
  
  ```
  1: ------------------------------------------------------------------
  1: Benchmark                        Time             CPU   Iterations
  1: ------------------------------------------------------------------
-1: BM_Initialization/hk2s     1587215 ns      1587485 ns          435
-1: BM_Initialization/hk2t      126112 ns       125976 ns         5384
-1: BM_Initialization/jp2t      245646 ns       245414 ns         2847
-1: BM_Initialization/s2hk    26017749 ns     26017390 ns           27
-1: BM_Initialization/s2t     26298084 ns     26296375 ns           27
-1: BM_Initialization/s2tw    26483120 ns     26482164 ns           27
-1: BM_Initialization/s2twp   26455564 ns     26454666 ns           26
-1: BM_Initialization/t2hk       44759 ns        44636 ns        15733
-1: BM_Initialization/t2jp      143401 ns       143227 ns         4876
-1: BM_Initialization/t2s      1374298 ns      1373979 ns          510
-1: BM_Initialization/tw2s     1443389 ns      1443701 ns          464
-1: BM_Initialization/tw2sp    1699645 ns      1699823 ns          399
-1: BM_Initialization/tw2t       76294 ns        76083 ns         9229
-1: BM_Convert                     581 ms          581 ms            1
-1/1 Test #1: BenchmarkTest ....................   Passed   14.49 sec
+1: BM_Initialization/hk2s        1.56 ms         1.56 ms          442
+1: BM_Initialization/hk2t       0.144 ms        0.144 ms         4878
+1: BM_Initialization/jp2t       0.260 ms        0.260 ms         2604
+1: BM_Initialization/s2hk        23.8 ms         23.8 ms           29
+1: BM_Initialization/s2t         25.6 ms         25.6 ms           28
+1: BM_Initialization/s2tw        24.0 ms         23.9 ms           30
+1: BM_Initialization/s2twp       24.6 ms         24.6 ms           28
+1: BM_Initialization/t2hk       0.052 ms        0.052 ms        12897
+1: BM_Initialization/t2jp       0.141 ms        0.141 ms         5012
+1: BM_Initialization/t2s         1.30 ms         1.30 ms          540
+1: BM_Initialization/tw2s        1.39 ms         1.39 ms          529
+1: BM_Initialization/tw2sp       1.69 ms         1.69 ms          426
+1: BM_Initialization/tw2t       0.089 ms        0.089 ms         7707
+1: BM_Convert2M                   582 ms          582 ms            1
+1: BM_Convert/100                1.07 ms         1.07 ms          636
+1: BM_Convert/1000               11.0 ms         11.0 ms           67
+1: BM_Convert/10000               113 ms          113 ms            6
+1: BM_Convert/100000             1176 ms         1176 ms            1
  ```
  
  ## Projects using OpenCC 使用 OpenCC 的項目
@@ -215,7 +222,7 @@ Apache License 2.0
  * [rapidjson](https://github.com/Tencent/rapidjson) MIT License
  * [Google Test](https://github.com/google/googletest) BSD License
  
-All these libraries are statically linked.
+All these libraries are statically linked by default.
  
  ## Change History 版本歷史
  
diff --git a/bdist_array.bash b/bdist_array.bash

deleted file mode 100755 (executable)

index 02dd0bd..0000000
--- a/bdist_array.bash
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-set -e
-
-DESC="Build distributable python wheel files for multiple python versions"
-USAGE="Usage: $0 CONDA_INIT_PATH"
-if [[ $1 == "-h" ]] || [[ $1 == "--help" ]]; then
-       echo $DESC
-       echo $USAGE
-       exit 0
-fi
-
-if [ ! $(command -v cmake) ]; then
-       echo "cmake is required"
-fi
-
-######## Source conda.sh
-if [[ ! $1 ]] ; then
-       echo "Expecting CONDA_INIT_PATH"
-       echo $USAGE
-       exit 1
-fi
-
-if [[ ! -f $1 ]] || [[ $1 != *"conda.sh" ]]; then
-       echo "Please provide a valid CONDA_INIT_PATH"
-       echo $USAGE
-       exit 1
-fi
-
-source $1
-
-######## Build array
-
-function clean_build_files() {
-       rm -rf build xcode python/opencc/clib *.egg-info dist/*.egg
-}
-
-VERSIONS="2.7 3.5 3.6 3.7 3.8"
-ROOT_DIR=$PWD
-
-for VER in ${VERSIONS}; do
-       echo "Building for python==$VER"
-       ENV_NAME=opencc-$VER
-
-       # Clean up existing builds
-       cd $ROOT_DIR
-       clean_build_files
-
-       # Create and initialize new environment
-       cd $ROOT_DIR
-       conda create -y -n $ENV_NAME "python=$VER"
-       conda activate $ENV_NAME
-       pip install --no-cache-dir setuptools wheel pytest
-
-       # Build, install, and test
-       cd $ROOT_DIR
-       python setup.py build_ext install
-       cd $ROOT_DIR/python
-       pytest .
-
-       # Package and clean up
-       cd $ROOT_DIR
-       python setup.py bdist_wheel
-       clean_build_files
-
-       conda deactivate
-
-       echo "Finished building for python==$VER"
-done
-
-clean_build_files
-echo "Done"
-echo "whl files saved to ./dist"
diff --git a/bdist_array.cmd b/bdist_array.cmd

deleted file mode 100644 (file)

index 1a5b323..0000000
--- a/bdist_array.cmd
+++ /dev/null
@@ -1,42 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-SET VERSIONS=2.7 3.5 3.6 3.7 3.8
-SET ROOT_DIR=%cd%
-
-for %%v in (%VERSIONS%) do (
-    echo Building for python==%%v
-    SET ENV_NAME=opencc-%%v
-
-    REM Clean up existing builds
-    cd %ROOT_DIR%
-    rmdir /S /Q build python\opencc\clib OpenCC.egg-info
-
-    REM Create and initialize new environment
-    cd %ROOT_DIR%
-    CALL conda create -y -n !ENV_NAME! python=%%v
-    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
-    CALL conda activate !ENV_NAME!
-    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
-
-    pip install --no-cache-dir setuptools wheel pytest
-    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
-
-    REM Build install and test
-    cd %ROOT_DIR%
-    python setup.py build_ext install
-    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
-    cd %ROOT_DIR%\python
-    pytest .
-    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
-
-    REM Package and clean up
-    cd %ROOT_DIR%
-    del dist\*.egg
-    python setup.py bdist_wheel
-    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
-    rmdir /S /Q build python\opencc\clib OpenCC.egg-info
-    CALL conda deactivate
-
-    echo Finished building for python==%%v
-)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt

index ae1917b8054dbddb934ff5e8978eff4e2f035b47..e9b921f508f4450ea910e1b61163fc012969ed03 100644 (file)
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -116,14 +116,25 @@ foreach(DICT ${DICTS_GENERATED})
    )
  endforeach(DICT)
  
+add_custom_target(
+  copy_libopencc_to_dir_of_opencc_dict
+  COMMENT
+    "Copying libopencc to directory of opencc_dict"
+  COMMAND
+    ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
+)
+if (WIN32)
+  set(DICT_WIN32_DEPENDS copy_libopencc_to_dir_of_opencc_dict)
+else()
+  set(DICT_WIN32_DEPENDS)
+endif()
+
  foreach(DICT ${DICTS})
    add_custom_command(
      OUTPUT
        ${DICT}.ocd2
      COMMENT
        "Building ${DICT}.ocd2"
-    COMMAND
-      ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
      COMMAND
        ${OPENCC_DICT_BIN}
          --input ${DICT_${DICT}_INPUT}
@@ -131,6 +142,7 @@ foreach(DICT ${DICTS})
          --from text
          --to ocd2
      DEPENDS
+      ${DICT_WIN32_DEPENDS}
        ${OPENCC_DICT_BIN}
        ${DICT_${DICT}_INPUT}
    )
diff --git a/data/dictionary/HKVariants.txt b/data/dictionary/HKVariants.txt

index e4d5f6399e906aea1526c409a39cc1e5978ddfdc..e0f688135ff60536e84093754bf72310c2ef0308 100644 (file)
--- a/data/dictionary/HKVariants.txt
+++ b/data/dictionary/HKVariants.txt
@@ -31,11 +31,13 @@
  爲    為
  癡    痴
  皁    皂
+祕    秘
  稅    税
  竈    灶
  糉    粽 糉 糭
  縕    緼
  纔    才
+脣    唇
  脫    脱
  膃    腽
  臥    卧
@@ -56,5 +58,6 @@
  鉢    缽
  鉤    鈎
  銳    鋭
+鍼    針
  閱    閲
  鰮    鰛
diff --git a/data/dictionary/JPVariants.txt b/data/dictionary/JPVariants.txt

index adf08ff1390fed27f8e04496d96490eee209f808..6ed3b9272826b9f06f5773052785a66ae5c79583 100644 (file)
--- a/data/dictionary/JPVariants.txt
+++ b/data/dictionary/JPVariants.txt
@@ -174,7 +174,7 @@
  瀧    滝
  瀨    瀬
  灣    湾
-ç\84\94    ç\84°
+ç\84°    ç\84\94
  燈    灯
  燒    焼
  營    営
diff --git a/data/dictionary/STCharacters.txt b/data/dictionary/STCharacters.txt

index fa3428a87578c12b5381690640207d3e30bae2e2..912d1625c07605e48f235a4aaa5c7d0ae182e332 100644 (file)
--- a/data/dictionary/STCharacters.txt
+++ b/data/dictionary/STCharacters.txt
@@ -11,7 +11,6 @@
  㔉    劚
  㖊    噚
  㖞    喎
-㗷    㘔
  㘎    㘚
  㚯    㜄
  㛀    媰
@@ -133,8 +132,8 @@
  䴕    鴷
  䴖    鶄
  䴗    鶪
-ä´\98    é·\88 é·\89
-ä´\99    é·¿ é¸\8a
+䴘    鷉
+䴙    鸊
  䶮    龑
  万    萬 万
  与    與
@@ -272,7 +271,7 @@
  减    減
  凑    湊
  凛    凜
-几    幾 几 機
+几    幾 几
  凤    鳳
  凫    鳧
  凭    憑
@@ -376,7 +375,6 @@
  吓    嚇
  吕    呂
  吗    嗎
-吣    唚
  吨    噸
  听    聽
  启    啓
@@ -412,7 +410,7 @@
  哜    嚌
  哝    噥
  哟    喲
-唇    脣
+唇    脣 唇
  唛    嘜
  唝    嗊
  唠    嘮
@@ -453,7 +451,6 @@
  圹    壙
  场    場
  坏    壞
-坐    坐 座
  块    塊
  坚    堅
  坛    壇 罈
@@ -477,7 +474,6 @@
  埘    塒
  埙    壎 塤
  埚    堝
-埯    垵
  堑    塹
  堕    墮
  塆    壪
@@ -534,6 +530,7 @@
  学    學
  孪    孿
  宁    寧 甯
+它    它 牠
  宝    寶
  实    實
  宠    寵
@@ -570,7 +567,6 @@
  岖    嶇
  岗    崗
  岘    峴
-岙    嶴
  岚    嵐
  岛    島
  岩    巖 岩
@@ -613,7 +609,6 @@
  帻    幘
  帼    幗
  幂    冪
-幞    襆
  干    幹 乾 干
  并    並 併
  幸    幸 倖
@@ -712,7 +707,7 @@
  戏    戲
  戗    戧
  战    戰
-戚    戚 慼 鏚
+戚    戚 慼
  戬    戩
  戯    戱
  户    戶
@@ -736,7 +731,6 @@
  抢    搶
  护    護
  报    報
-抬    擡
  抵    抵 牴
  担    擔
  拐    拐 柺
@@ -812,6 +806,7 @@
  斗    鬥 斗
  斩    斬
  断    斷
+旋    旋 鏇
  无    無
  旧    舊
  时    時
@@ -899,7 +894,7 @@
  梿    槤
  检    檢
  棁    梲
-æ£\82    æ«º æ¬\9e
+棂    欞
  椁    槨
  椝    槼
  椟    櫝
@@ -947,7 +942,7 @@
  毙    斃
  毡    氈
  毵    毿
-毶    毿 𣯶
+毶    𣯶
  氇    氌
  气    氣
  氢    氫
@@ -968,6 +963,7 @@
  沨    渢
  沩    潙
  沪    滬
+沾    沾 霑
  泛    泛 氾 汎
  泞    濘
  注    注 註
@@ -1090,7 +1086,7 @@
  焖    燜
  焘    燾
  煴    熅
-熏    薰 燻
+熏    燻 熏
  爱    愛
  爷    爺
  牍    牘
@@ -1125,6 +1121,7 @@
  玙    璵
  玚    瑒
  玛    瑪
+玩    玩 翫
  玮    瑋
  环    環
  现    現
@@ -1141,6 +1138,7 @@
  瑶    瑤
  瑷    璦
  瑸    璸
+璇    璇 璿
  璎    瓔
  瓒    瓚
  瓮    甕
@@ -1253,7 +1251,6 @@
  稣    穌
  稳    穩
  穑    穡
-穗    穗 繐
  穞    穭
  穷    窮
  窃    竊
@@ -1345,7 +1342,7 @@
  纺    紡
  纻    紵
  纼    紖
-纽    紐 鈕
+纽    紐
  纾    紓
  线    線
  绀    紺
@@ -1403,7 +1400,7 @@
  维    維
  绵    綿
  绶    綬
-绷    繃 綳 
+绷    繃 綳
  绸    綢
  绹    綯
  绺    綹
@@ -1546,7 +1543,6 @@
  芗    薌
  芜    蕪
  芦    蘆
-芲    芲 菕
  芸    芸 蕓
  苁    蓯
  苇    葦
@@ -1557,7 +1553,6 @@
  苎    苧
  苏    蘇 甦 囌
  苔    苔 薹
-苘    檾
  苧    薴
  苹    蘋 苹
  范    範 范
@@ -1668,7 +1663,7 @@
  蝇    蠅
  蝈    蟈
  蝉    蟬
-蝎    蠍
+蝎    蠍 蝎
  蝼    螻
  蝾    蠑
  螀    螿
@@ -1952,6 +1947,7 @@
  趸    躉
  跃    躍
  跄    蹌
+跖    蹠 跖
  跞    躒
  践    踐
  跶    躂
@@ -2221,7 +2217,7 @@
  锌    鋅
  锍    鋶
  锎    鐦
-é\94\8f    é\90\97 é\90§
+锏    鐧
  锐    銳
  锑    銻
  锒    鋃
@@ -2246,7 +2242,7 @@
  锥    錐
  锦    錦
  锧    鑕
-锨    杴 鍁
+锨    鍁
  锩    錈
  锪    鍃
  锫    錇 鉳
@@ -2269,13 +2265,13 @@
  锼    鎪
  锽    鍠
  锾    鍰
-锿    鎄 鑀
+锿    鎄
  镀    鍍
  镁    鎂
  镂    鏤
  镃    鎡
  镄    鐨
-镅    鎇 鋂
+镅    鎇
  镆    鏌
  镇    鎮
  镈    鎛
@@ -2668,7 +2664,7 @@
  鲳    鯧
  鲴    鯝
  鲵    鯢
-é²¶    é®\8e é¯°
+鲶    鯰
  鲷    鯛
  鲸    鯨
  鲹    鰺
@@ -2679,7 +2675,7 @@
  鲾    鰏
  鲿    鱨
  鳀    鯷
-鳁    鰮 鰛
+鳁    鰮
  鳂    鰃
  鳃    鰓
  鳄    鱷
@@ -2774,7 +2770,7 @@
  鹗    鶚
  鹘    鶻
  鹙    鶖
-é¹\9a    é¶¿
+é¹\9a    é·\80
  鹛    鶥
  鹜    鶩
  鹝    鷊
@@ -2816,9 +2812,7 @@
  鼋    黿
  鼌    鼂
  鼍    鼉
-鼗    鞀
  鼹    鼴
-齄    齇
  齐    齊
  齑    齏
  齿    齒
@@ -2849,7 +2843,6 @@
  𠇹   俓
  𠉂   㒓
  𠉗   𠏢
-𠊉   𣍐
  𠋆   儭
  𠚳   𠠎
  𠛅   剾
@@ -2955,7 +2948,7 @@
  𤊀   𤒎
  𤊰   𤓩
  𤋏   熡
-𤎺   㸇
+𤎺   𤓎
  𤎻   𤑳
  𤙯   𤛮
  𤝢   𤢟
@@ -3032,7 +3025,6 @@
  𦶟   爇
  𦶻   𦾟
  𦻕   蘟
-𦼖   檾
  𧉐   𧕟
  𧉞   䗿
  𧌥   𧎈
@@ -3206,7 +3198,6 @@
  𩽽   𩶱
  𩽾   鮟
  𩽿   𩶰
-𩾀   鮕
  𩾁   鯄
  𩾂   䲖
  𩾃   鮸
@@ -3235,7 +3226,6 @@
  𪉐   𪃍
  𪉑   鷔
  𪉒   𪄕
-𪉓   𪈼
  𪉔   𪄆
  𪉕   𪇳
  𪎈   䴬
@@ -3243,7 +3233,6 @@
  𪎊   麨
  𪎋   䴴
  𪎌   麳
-𪎍   𪋿
  𪑅   䵳
  𪔭   𪔵
  𪚏   𪘀
@@ -3872,6 +3861,9 @@
  𫠖   𩿅
  𫠜   齯
  𫢸   僤
+𫧃   𣍐
+𫧮   𪋿
+𫬐   㘔
  𫮃   墠
  𫰛   娙
  𫶇   嵽
@@ -3882,6 +3874,7 @@
  𬬻   鑪
  𬭊   𨧀
  𬭛   𨨏
+𬭭   鏚
  𬭳   𨭎
  𬭶   𨭆
  𬶋   鮈
@@ -3889,3 +3882,10 @@
  𬶏   鮠
  𬶟   鯻
  𬸪   鷭
+𬸯   鷿
+𰬸   繐
+𰰨   菕
+𰶎   譅
+𰾄   鋂
+𰾭   鑀
+𱊜   𪈼
diff --git a/data/dictionary/STPhrases.txt b/data/dictionary/STPhrases.txt

index a2b50e55fbedad9464702f609c5924cfed3dd57b..5a57bdc0a92376c173341ec5f3922ba69a743ebf 100644 (file)
--- a/data/dictionary/STPhrases.txt
+++ b/data/dictionary/STPhrases.txt
@@ -283,7 +283,6 @@
  丁零当啷   丁零當啷
  丁鸿志      丁鴻志
  七万 七萬
-七里 七里
  七万三千   七萬三千
  七万五千   七萬五千
  七万八千   七萬八千
@@ -343,6 +342,7 @@
  七窍冒烟   七竅冒煙
  七窍生烟   七竅生煙
  七色板      七色板
+七里 七里
  七里河      七里河
  七里河区   七里河區
  七里香      七里香
@@ -682,7 +682,6 @@
  丈八灯台   丈八燈臺
  丈母娘      丈母孃
  三万 三萬
-三里 三里
  三个 三個
  三个鼻子管        三個鼻子管
  三丰 三豐
@@ -808,6 +807,7 @@
  三连胜      三連勝
  三部合唱   三部合唱
  三部曲      三部曲
+三里 三里
  三里屯      三里屯
  三里河      三里河
  三针 三針
@@ -2254,6 +2254,7 @@
  乐极悲生   樂極悲生
  乐极生悲   樂極生悲
  乐游原      樂遊原
+乐理 樂理
  乐祸幸灾   樂禍幸災
  乐透彩      樂透彩
  乐颠了馅   樂顛了餡
@@ -2349,6 +2350,7 @@
  也须 也須
  习于 習於
  习惯于      習慣於
+习玩 習翫
  习非胜是   習非勝是
  乡党 鄉黨
  乡党尚齿   鄉黨尚齒
@@ -3559,6 +3561,7 @@
  代数几何   代數幾何
  代数曲线   代數曲線
  代数曲面   代數曲面
+代理 代理
  代码表      代碼表
  代签 代簽
  代签人      代簽人
@@ -3905,6 +3908,7 @@
  伤痕累累   傷痕累累
  伤药 傷藥
  伤风克      傷風克
+伦理 倫理
  伦理规范   倫理規範
  伪托 僞託
  伪药 僞藥
@@ -5781,7 +5785,6 @@
  公门修行   公門修行
  公门里好修行     公門裏好修行
  六万 六萬
-六里 六里
  六个 六個
  六余 六餘
  六冲 六沖
@@ -5819,6 +5822,7 @@
  六谷 六穀
  六通四辟   六通四辟
  六道轮回   六道輪迴
+六里 六里
  六面 六面
  六面体      六面體
  六须鲇      六鬚鮎
@@ -6693,7 +6697,6 @@
  凝炼 凝鍊
  几丁质      幾丁質
  几万 幾萬
-几里 幾里
  几万个      幾萬個
  几万人      幾萬人
  几万元      幾萬元
@@ -6927,7 +6930,7 @@
  几点几      幾點幾
  几点钟      幾點鐘
  几版 幾版
-几率 機率
+几率 幾率
  几环 幾環
  几班 幾班
  几番 幾番
@@ -7001,6 +7004,7 @@
  几道 幾道
  几道菜      幾道菜
  几部 幾部
+几里 幾里
  几针 幾針
  几门 幾門
  几间 幾間
@@ -7044,7 +7048,7 @@
  凯特布兰琪        凱特布蘭琪
  凯迪拉克   凱迪拉克
  凯里 凱里
-凯里市      凱裏市
+凯里市      凱里市
  凶事 凶事
  凶人 兇人
  凶仪 兇儀
@@ -8887,6 +8891,7 @@
  动配合      動配合
  助于 助於
  助恶 助惡
+助理 助理
  助选团      助選團
  努瓦克肖特        努瓦克肖特
  劫余 劫餘
@@ -11509,6 +11514,7 @@
  取舍之间   取捨之間
  取舍难定   取捨難定
  取药 取藥
+取阳谷      取陽谷
  受不了      受不了
  受了 受了
  受人之托   受人之託
@@ -11526,6 +11532,7 @@
  受托人      受託人
  受托者      受託者
  受折磨      受折磨
+受理 受理
  受用不尽   受用不盡
  受聘于      受聘於
  受阻于      受阻於
@@ -11600,7 +11607,6 @@
  口服药      口服藥
  口杯 口杯
  口燥唇干   口燥脣乾
-口燥脣干   口燥脣乾
  口腔里      口腔裏
  口腹之欲   口腹之慾
  口血未干   口血未乾
@@ -14772,6 +14778,7 @@
  命世才      命世才
  命中注定   命中註定
  命名系统   命名系統
+命理 命理
  命运注定   命運註定
  命题范围   命題範圍
  咀咽 咀嚥
@@ -15067,15 +15074,22 @@
  哲学系      哲學系
  哲学范畴   哲學範疇
  哲布尊丹巴        哲布尊丹巴
+哲理 哲理
  哲里木      哲里木
  哺喂 哺餵
  哼个 哼個
  哼出 哼出
  哽咽 哽咽
  唁吊 唁弔
+唇似抹朱   脣似抹朱
+唇如涂朱   脣如塗朱
  唇干 脣乾
  唇彩 脣彩
+唇彩盘      脣彩盤
  唇燥舌干   脣燥舌乾
+唇若抹朱   脣若抹朱
+唇若涂朱   脣若塗朱
+唇若涂脂   脣若塗脂
  唉叹 唉嘆
  唐三彩      唐三彩
  唐志中      唐志中
@@ -15519,7 +15533,7 @@
  回帖 回帖
  回带 迴帶
  回席 回席
-回应 迴應
+回应 回應
  回府 回府
  回廊 迴廊
  回弹 回彈
@@ -16209,6 +16223,7 @@
  地牛发威   地牛發威
  地狱谷      地獄谷
  地球同步轨道     地球同步軌道
+地理 地理
  地理极      地理極
  地理资讯系统     地理資訊系統
  地瓜叶      地瓜葉
@@ -16575,6 +16590,7 @@
  处于 處於
  处女表演   處女表演
  处方药      處方藥
+处理 處理
  处理厂      處理廠
  处理表      處理表
  备尝 備嘗
@@ -17027,7 +17043,6 @@
  夙愿 夙願
  夙愿以偿   夙願以償
  多不胜数   多不勝數
-多里 多里
  多丑 多醜
  多么 多麼
  多义关系   多義關係
@@ -17108,6 +17123,7 @@
  多边合作   多邊合作
  多采 多采
  多采多姿   多采多姿
+多里 多里
  多面 多面
  多面体      多面體
  多面性      多面性
@@ -17527,6 +17543,7 @@
  天渊之别   天淵之別
  天潢贵胄   天潢貴胄
  天然纤维   天然纖維
+天璇 天璇
  天生干      天生幹
  天盟誓表现        天盟誓表現
  天纳克      天納克
@@ -18175,7 +18192,6 @@
  威克菲尔   威克菲爾
  威克菲尔德        威克菲爾德
  威奇托      威奇托
-威宁彝族回族苗族自治县      威寧彝族回族苗族自治縣
  威尔生氏症        威爾生氏症
  威布里吉   威布里吉
  威廉亚历山大     威廉亞歷山大
@@ -18538,6 +18554,7 @@
  定时号志   定時號誌
  定时钟      定時鐘
  定点厂      定點廠
+定理 定理
  定碳杯      定碳杯
  定胜败      定勝敗
  定范围      定範圍
@@ -18585,6 +18602,7 @@
  审干 審幹
  审曲面势   審曲面勢
  审核 審覈
+审理 審理
  审级制度   審級制度
  审计范围   審計範圍
  客串演出   客串演出
@@ -18713,6 +18731,7 @@
  密苏里      密蘇里
  密苏里州   密蘇里州
  密苏里河   密蘇里河
+寇不可玩   寇不可翫
  寇仇 寇仇
  寇准 寇準
  富于 富於
@@ -18808,7 +18827,6 @@
  寻找出来   尋找出來
  寻来范畴   尋來範疇
  寻求出来   尋求出來
-寻甸回族彝族自治县    尋甸回族彝族自治縣
  寻获 尋獲
  导出 導出
  导出值      導出值
@@ -19294,6 +19312,7 @@
  尽本分      盡本分
  尽欢 盡歡
  尽欢而散   盡歡而散
+尽沾恩露   盡霑恩露
  尽然 盡然
  尽瘁 盡瘁
  尽瘁鞠躬   盡瘁鞠躬
@@ -19775,9 +19794,9 @@
  巴贝西亚原虫病  巴貝西亞原蟲病
  巴里 巴里
  巴里坤      巴里坤
-巴里坤县   巴裏坤縣
-巴里坤哈萨克自治县    巴裏坤哈薩克自治縣
-巴里坤草原        巴裏坤草原
+巴里坤县   巴里坤縣
+巴里坤哈萨克自治县    巴里坤哈薩克自治縣
+巴里坤草原        巴里坤草原
  巴里岛      巴里島
  巴里库廷火山     巴里庫廷火山
  巴里斯      巴里斯
@@ -21528,6 +21547,7 @@
  张基郁      張基郁
  张堪折辕   張堪折轅
  张大千      張大千
+张必 張必
  张志 張志
  张志和      張志和
  张志家      張誌家
@@ -22585,6 +22605,7 @@
  心游 心遊
  心满愿足   心滿願足
  心物合一   心物合一
+心理 心理
  心理发展   心理發展
  心理学系   心理學系
  心理系      心理系
@@ -22652,6 +22673,7 @@
  必死之症   必死之症
  必胜 必勝
  必胜客      必勝客
+必须 必須
  忆念 憶念
  忌烟 忌菸
  忍个 忍個
@@ -23002,6 +23024,7 @@
  总杆数      總桿數
  总杆赛      總桿賽
  总汇 總彙
+总理 總理
  总统制      總統制
  总统杯      總統盃
  总裁制      總裁制
@@ -24924,6 +24947,7 @@
  护壁板      護壁板
  护念 護念
  护板 護板
+护理 護理
  护理系      護理系
  护面 護面
  护面具      護面具
@@ -26065,6 +26089,7 @@
  推杯 推杯
  推派出      推派出
  推演出来   推演出來
+推理 推理
  推算出      推算出
  推算出来   推算出來
  推舟于陆   推舟於陸
@@ -26896,7 +26921,6 @@
  敬烟 敬菸
  敬鉴 敬鑒
  数万 數萬
-数里 數里
  数万人      數萬人
  数万元      數萬元
  数不尽      數不盡
@@ -26953,9 +26977,11 @@
  数据链路连接识别码    數據鏈路連接識別碼
  数术 數術
  数杯 數杯
+数理 數理
  数百万      數百萬
  数米志炊   數米志炊
  数罪并罚   數罪併罰
+数里 數里
  敲丧钟      敲喪鐘
  敲了 敲了
  敲出 敲出
@@ -27003,6 +27029,7 @@
  整杯酒      整杯酒
  整柜 整櫃
  整根烟      整根菸
+整理 整理
  整理出      整理出
  整理出来   整理出來
  整装待发   整裝待發
@@ -27240,6 +27267,7 @@
  斗趣 鬥趣
  斗趣儿      鬥趣兒
  斗车 斗車
+斗转 斗轉
  斗转参横   斗轉參橫
  斗转星移   斗轉星移
  斗酒 斗酒
@@ -28107,7 +28135,6 @@
  景胄 景胄
  景致 景緻
  景谷 景谷
-景谷傣族彝族自治县    景谷傣族彝族自治縣
  景谷县      景谷縣
  晴了 晴了
  晴云秋月   晴雲秋月
@@ -28825,7 +28852,7 @@
  木薯淀粉   木薯澱粉
  木蜡 木蠟
  木表法      木表法
-木里藏族自治县  木裏藏族自治縣
+木里藏族自治县  木里藏族自治縣
  木钟 木鐘
  木铲 木鏟
  木雕 木雕
@@ -28964,7 +28991,9 @@
  朱咏薇      朱詠薇
  朱哲琴      朱哲琴
  朱唇 朱脣
-朱唇皓齿   硃脣皓齒
+朱唇榴齿   朱脣榴齒
+朱唇皓齿   朱脣皓齒
+朱唇粉面   朱脣粉面
  朱培庆      朱培慶
  朱墨 朱墨
  朱墨本      朱墨本
@@ -29030,7 +29059,6 @@
  朱淑真      朱淑真
  朱温 朱溫
  朱漆 朱漆
-朱熔基      朱熔基
  朱熹 朱熹
  朱理安历   朱理安曆
  朱理安历史        朱理安歷史
@@ -29059,10 +29087,6 @@
  朱经武      朱經武
  朱美 朱美
  朱耷 朱耷
-朱脣 朱脣
-朱脣榴齿   朱脣榴齒
-朱脣皓齿   朱脣皓齒
-朱脣粉面   朱脣粉面
  朱自清      朱自清
  朱舜水      朱舜水
  朱色 硃色
@@ -29296,6 +29320,7 @@
  李杰 李傑
  李洪志      李洪志
  李炳千      李炳千
+李白 李白
  李百药      李百藥
  李盟干      李盟乾
  李秋静      李秋靜
@@ -30613,6 +30638,7 @@
  梳发 梳髮
  梳头发      梳頭髮
  梳妆台      梳妝檯
+梳理 梳理
  梵册贝叶   梵冊貝葉
  梵谷 梵谷
  检修 檢修
@@ -31295,6 +31321,7 @@
  毫发无损   毫髮無損
  毫发未伤   毫髮未傷
  毫居里      毫居里
+毫无 毫無
  毫无二致   毫無二致
  毫无价值   毫無價值
  毫无准备   毫無準備
@@ -31988,7 +32015,11 @@
  沽名吊誉   沽名吊譽
  沽名干誉   沽名干譽
  沽酒当炉   沽酒當爐
+沾体 霑體
+沾恩 霑恩
  沾染控制   沾染控制
+沾洽 霑洽
+沾衿 霑衿
  沿才授职   沿才授職
  沿门托钵   沿門托鉢
  沿门挨户   沿門挨戶
@@ -32046,10 +32077,12 @@
  法术 法術
  法术无边   法術無邊
  法柜奇兵   法櫃奇兵
+法理 法理
  法系 法系
  法西斯党   法西斯黨
  法语系      法語系
  法身舍利   法身舍利
+法雨均沾   法雨均霑
  法鲁克      法魯克
  泛了 泛了
  泛亚 泛亞
@@ -32962,6 +32995,7 @@
  清水烟      清水煙
  清汤挂面   清湯掛麪
  清浊同流   清濁同流
+清理 清理
  清算斗争   清算鬥爭
  清胄 清胄
  清芬志      清芬志
@@ -33269,7 +33303,7 @@
  湖南师范大学     湖南師範大學
  湖州师范学院     湖州師範學院
  湖里 湖裏
-湖里区      湖裏區
+湖里区      湖里區
  湖面 湖面
  湘帘 湘簾
  湘累 湘累
@@ -33381,7 +33415,7 @@
  满拚自尽   滿拚自盡
  满杯 滿杯
  满洲里      滿洲里
-满洲里市   滿洲裏市
+满洲里市   滿洲里市
  满满当当   滿滿當當
  满脸溅朱   滿臉濺朱
  满腹才学   滿腹才學
@@ -33670,6 +33704,7 @@
  灵谷寺      靈谷寺
  灵迹 靈蹟
  灸术 灸術
+灸阳谷      灸陽谷
  灾后 災後
  灾害链      災害鏈
  灿烂多彩   燦爛多彩
@@ -34339,6 +34374,7 @@
  物欲世界   物慾世界
  物欲横流   物慾橫流
  物流系统   物流系統
+物理 物理
  物理系      物理系
  物种 物種
  物种来由   物種來由
@@ -34696,6 +34732,7 @@
  玩出去      玩出去
  玩出来      玩出來
  玩团 玩團
+玩忽 翫忽
  玩物丧志   玩物喪志
  环保斗士   環保鬥士
  环安系      環安系
@@ -34967,6 +35004,7 @@
  生物时钟   生物時鐘
  生物系      生物系
  生物钟      生物鐘
+生理 生理
  生理时钟   生理時鐘
  生田斗      生田斗
  生离死别   生離死別
@@ -35274,6 +35312,7 @@
  病愈 病癒
  病毒血症   病毒血症
  病毒防范   病毒防範
+病理 病理
  病症 病症
  病舍 病舍
  病虫 病蟲
@@ -35601,8 +35640,7 @@
  皓发 皓髮
  皓月千里   皓月千里
  皓月当空   皓月當空
-皓齿朱唇   皓齒硃脣
-皓齿朱脣   皓齒朱脣
+皓齿朱唇   皓齒朱脣
  皖系军阀   皖系軍閥
  皖系战败   皖系戰敗
  皙面 皙面
@@ -35712,6 +35750,7 @@
  盛极而衰   盛極而衰
  盛行于      盛行於
  盛赞 盛讚
+盜跖 盜跖
  盟旗制度   盟旗制度
  目前目后   目前目後
  目力表      目力表
@@ -36434,6 +36473,7 @@
  神杯 神杯
  神游 神遊
  神游太虚   神遊太虛
+神秘 神祕
  神经干      神經幹
  神经战术   神經戰術
  神经症      神經症
@@ -36877,6 +36917,7 @@
  秒钟 秒鐘
  秕谷 秕穀
  秘制 祕製
+秘密 祕密
  秘录 祕錄
  租价 租價
  租借 租借
@@ -37527,7 +37568,6 @@
  算出来      算出來
  算历 算曆
  算发 算髮
-算发现      算發現
  算得了      算得了
  算术 算術
  算术和      算術和
@@ -37562,6 +37602,7 @@
  管干 管幹
  管弦 管絃
  管弦乐团   管弦樂團
+管理 管理
  管理人才   管理人才
  管理体制   管理體制
  管理系      管理系
@@ -37638,7 +37679,7 @@
  粉签子      粉籤子
  粉红色系   粉紅色系
  粉面 粉面
-粉面朱脣   粉面硃脣
+粉面朱唇   粉面朱脣
  粉面油头   粉面油頭
  粉饰门面   粉飾門面
  粒变岩      粒變岩
@@ -38157,7 +38198,6 @@
  纺锤虫      紡錘蟲
  纽几内亚   紐幾內亞
  纽华克      紐華克
-纽扣 鈕釦
  纽瓦克      紐瓦克
  纽芬兰与拉布拉多       紐芬蘭與拉布拉多
  纽蒙特      紐蒙特
@@ -38278,6 +38318,7 @@
  经济计划   經濟計劃
  经济部标准检验局       經濟部標準檢驗局
  经济面      經濟面
+经理 經理
  经营决策资讯系统       經營決策資訊系統
  经营范围   經營範圍
  经贸关系   經貿關係
@@ -39723,12 +39764,6 @@
  脚踏板      腳踏板
  脚酸 腳痠
  脚面 腳面
-脣似抹朱   脣似抹硃
-脣如涂朱   脣如塗朱
-脣彩盘      脣彩盤
-脣若抹朱   脣若抹硃
-脣若涂朱   脣若塗硃
-脣若涂脂   脣若塗脂
  脱不了      脫不了
  脱不了身   脫不了身
  脱了 脫了
@@ -40041,7 +40076,6 @@
  舌后 舌後
  舌尖后音   舌尖後音
  舌干唇焦   舌乾脣焦
-舌干脣焦   舌乾脣焦
  舌面 舌面
  舌面元音   舌面元音
  舌面前音   舌面前音
@@ -40451,8 +40485,6 @@
  苏建忠      蘇建忠
  苏建荣      蘇建榮
  苏式 蘇式
-苏彝士      蘇彝士
-苏彝士运河        蘇彝士運河
  苏德曼      蘇德曼
  苏必利尔湖        蘇必利爾湖
  苏必略湖   蘇必略湖
@@ -41938,6 +41970,7 @@
  行雨朝云   行雨朝雲
  衍声复词   衍聲複詞
  衍极 衍極
+衍生 衍生
  衍生出      衍生出
  衍生出来   衍生出來
  衔哀致诚   銜哀致誠
@@ -42654,6 +42687,7 @@
  计穷力尽   計窮力盡
  计穷力极   計窮力極
  计穷虑极   計窮慮極
+计算 計算
  计算出      計算出
  计算出来   計算出來
  计算机制图        計算機製圖
@@ -43065,8 +43099,8 @@
  读后 讀後
  读后心得   讀後心得
  读后感      讀後感
+读唇术      讀脣術
  读心术      讀心術
-读脣术      讀脣術
  课余 課餘
  课前课后   課前課後
  课卷 課卷
@@ -43477,10 +43511,10 @@
  费尔干纳盆地     費爾幹納盆地
  费尔法克斯        費爾法克斯
  费尽 費盡
+费尽唇舌   費盡脣舌
  费尽心思   費盡心思
  费尽心机   費盡心機
  费尽精神   費盡精神
-费尽脣舌   費盡脣舌
  费杰罗      費傑羅
  费洛蒙      費洛蒙
  费玛最后定理     費瑪最後定理
@@ -43860,6 +43894,9 @@
  跑回来      跑回來
  跑得了和尚跑不了庙    跑得了和尚跑不了廟
  跑表 跑表
+跖犬吠尧   跖犬吠堯
+跖狗吠尧   跖狗吠堯
+跖蹻 跖蹻
  跗注 跗注
  跗面 跗面
  跛行症      跛行症
@@ -43970,6 +44007,7 @@
  蹭棱子      蹭棱子
  蹲了 蹲了
  蹲板 蹲板
+蹻跖 蹻跖
  躁狂抑郁症        躁狂抑鬱症
  躁狂症      躁狂症
  躁郁 躁鬱
@@ -45880,6 +45918,7 @@
  针锋 針鋒
  针锋相对   針鋒相對
  针锋相投   針鋒相投
+针阳谷      鍼陽谷
  针饵莫减   針餌莫減
  针骨 針骨
  针鱼 針魚
@@ -46585,8 +46624,9 @@
  阳电极      陽電極
  阳秋 陽秋
  阳虚发热   陽虛發熱
-阳谷 陽穀
+阳谷 陽穀 陽谷
  阳谷县      陽穀縣
+阳谷穴      陽谷穴
  阳面 陽面
  阴丹布      陰丹布
  阴云 陰雲
@@ -47128,6 +47168,7 @@
  雨约云期   雨約雲期
  雨花台      雨花臺
  雨花台区   雨花臺區
+雨露均沾   雨露均霑
  雨魄云魂   雨魄雲魂
  雩坛 雩壇
  雪松 雪松
@@ -47626,7 +47667,7 @@
  面霜 面霜
  面露不悦   面露不悅
  面霸 麪霸
-面青脣白   面青脣白
+面青唇白   面青脣白
  面面 面面
  面面俱全   面面俱全
  面面俱到   面面俱到
@@ -47648,9 +47689,9 @@
  面首 面首
  面驾 面駕
  面黄 面黃
+面黄唇白   面黃脣白
  面黄肌瘦   面黃肌瘦
  面黄肌闳   面黃肌閎
-面黄脣白   面黃脣白
  革出 革出
  革出山门   革出山門
  革出教门   革出教門
@@ -48179,7 +48220,7 @@
  香愿 香願
  香斗 香斗
  香格里拉   香格里拉
-香格里拉县        香格裏拉縣
+香格里拉县        香格里拉縣
  香格里拉怡咖啡  香格里拉怡咖啡
  香榭丽舍   香榭麗舍
  香榭丽舍大街     香榭麗舍大街
@@ -48614,6 +48655,7 @@
  鸦片烟      鴉片煙
  鸦窝里出凤凰     鴉窩裏出鳳凰
  鸭子划水   鴨子划水
+鸭跖草      鴨跖草
  鸳鸯折颈   鴛鴦折頸
  鸷虫 鷙蟲
  鸿志 鴻志
diff --git a/data/dictionary/TSCharacters.txt b/data/dictionary/TSCharacters.txt

index f923287d4714faeaee9903fd1624a15a0931aa6a..5dc2b2b1855efe22eb7360da119ab7a564aea8a7 100644 (file)
--- a/data/dictionary/TSCharacters.txt
+++ b/data/dictionary/TSCharacters.txt
@@ -11,7 +11,7 @@
  㗿    𪡛
  㘉    𠰱
  㘓    𪢌
-㘔    㗷
+㘔    𫬐
  㘚    㘎
  㛝    𫝦
  㜄    㚯
@@ -350,7 +350,6 @@
  哯    𠯟
  唄    呗
  唓    𪠳
-唚    吣
  唸    念
  問    问
  啓    启
@@ -440,7 +439,6 @@
  圖    图
  團    团
  圞    𪢮
-垵    埯
  埡    垭
  埬    𪣆
  埰    采
@@ -496,7 +494,7 @@
  壽    寿
  夠    够
  夢    梦
-夥    伙
+夥    伙 夥
  夾    夹
  奐    奂
  奧    奥
@@ -605,7 +603,6 @@
  嶧    峄
  嶨    峃
  嶮    崄
-嶴    岙
  嶸    嵘
  嶹    𫝵
  嶺    岭
@@ -667,7 +664,6 @@
  彎    弯
  彔    录
  彙    汇
-彞    彝
  彠    彟
  彥    彦
  彫    雕
@@ -820,7 +816,6 @@
  據    据
  擟    𪭧
  擠    挤
-擡    抬
  擣    捣 𢭏
  擫    𢬍
  擬    拟
@@ -893,7 +888,6 @@
  朧    胧
  朮    术
  東    东
-杴    锨
  枴    拐
  柵    栅
  柺    拐
@@ -978,7 +972,6 @@
  檵    𪲛
  檸    柠
  檻    槛
-檾    𦼖
  櫃    柜
  櫅    𪲎
  櫓    橹
@@ -997,7 +990,6 @@
  櫱    蘖
  櫳    栊
  櫸    榉
-櫺    棂
  櫻    樱
  欄    栏
  欅    榉
@@ -1051,7 +1043,6 @@
  汎    泛
  汙    污
  決    决
-沈    沈 沉
  沒    没
  沖    冲
  況    况
@@ -1313,6 +1304,7 @@
  璼    𫞨
  璽    玺
  璾    𫞦
+璿    璇
  瓄    𪻨
  瓊    琼
  瓏    珑
@@ -1395,7 +1387,6 @@
  睏    困
  睜    睁
  睞    睐
-睪    睾 睪
  瞘    眍
  瞜    䁖
  瞞    瞒
@@ -1723,7 +1714,7 @@
  繆    缪
  繈    𫄶
  繏    𦈝
-繐    穗
+繐    𰬸
  繒    缯
  繓    𦈛
  織    织
@@ -1785,6 +1776,7 @@
  羵    𫅗
  羶    膻
  習    习
+翫    玩
  翬    翚
  翹    翘
  翽    翙
@@ -1863,7 +1855,7 @@
  莖    茎
  莢    荚
  莧    苋
-菕    芲
+菕    𰰨
  華    华
  菴    庵
  菸    烟
@@ -1930,7 +1922,6 @@
  薟    莶
  薦    荐
  薩    萨
-薰    薰 熏
  薳    䓕
  薴    苧
  薵    䓓
@@ -2035,7 +2026,6 @@
  褸    褛
  褻    亵
  襀    𫌀
-襆    幞
  襇    裥
  襉    裥
  襏    袯
@@ -2249,7 +2239,7 @@
  謾    谩
  譁    哗
  譂    𫟠
-譅    䜧
+譅    𰶎
  譆    𫍻
  證    证
  譊    𫍢
@@ -2391,6 +2381,7 @@
  蹔    𫏐
  蹕    跸
  蹟    迹
+蹠    跖
  蹣    蹒
  蹤    踪
  蹳    𫏆
@@ -2602,7 +2593,7 @@
  鈑    钣
  鈒    钑
  鈔    钞
-鈕    钮 纽
+鈕    钮
  鈖    𫟴
  鈗    𫟵
  鈛    𫓨
@@ -2690,7 +2681,7 @@
  銻    锑
  銼    锉
  鋁    铝
-鋂    镅
+鋂    𰾄
  鋃    锒
  鋅    锌
  鋇    钡
@@ -2818,7 +2809,7 @@
  鎿    镎
  鏃    镞
  鏆    𨱌
-鏇    镟
+鏇    旋 镟
  鏈    链
  鏉    𨱒
  鏌    镆
@@ -2827,7 +2818,7 @@
  鏑    镝
  鏗    铿
  鏘    锵
-鏚    戚
+鏚    𬭭
  鏜    镗
  鏝    镘
  鏞    镛
@@ -2857,7 +2848,6 @@
  鐒    铹
  鐓    镦
  鐔    镡
-鐗    锏
  鐘    钟
  鐙    镫
  鐝    镢
@@ -2879,7 +2869,7 @@
  鐼    𫔁
  鐽    𫟼
  鐿    镱
-鑀    锿
+鑀    𰾭
  鑄    铸
  鑉    𫠁
  鑊    镬
@@ -2906,7 +2896,6 @@
  鑿    凿
  钁    镢 䦆
  钂    镋
-镟    旋
  長    长
  門    门
  閂    闩
@@ -3000,6 +2989,7 @@
  難    难
  雲    云
  電    电
+霑    沾
  霢    霡
  霣    𫕥
  霧    雾
@@ -3016,7 +3006,6 @@
  靦    腼 䩄
  靧    𫖃
  靨    靥
-鞀    鼗
  鞏    巩
  鞝    绱
  鞦    秋
@@ -3142,6 +3131,7 @@
  餃    饺
  餄    饸
  餅    饼
+餈    糍
  餉    饷
  養    养
  餌    饵
@@ -3340,7 +3330,6 @@
  鮑    鲍
  鮒    鲋
  鮓    鲊
-鮕    𩾀
  鮚    鲒
  鮜    鲘
  鮝    鲞
@@ -3559,7 +3548,6 @@
  鷂    鹞
  鷄    鸡
  鷅    𫛽
-鷈    䴘
  鷉    䴘
  鷊    鹝
  鷐    𫜀
@@ -3585,7 +3573,7 @@
  鷹    鹰
  鷺    鹭
  鷽    鸴
-鷿    䴙
+鷿    𬸯
  鸂    㶉
  鸇    鹯
  鸊    䴙
@@ -3633,7 +3621,6 @@
  鼉    鼍
  鼕    冬
  鼴    鼹
-齇    齄
  齊    齐
  齋    斋
  齎    赍
@@ -3698,7 +3685,6 @@
  𡞵   㛟
  𡟫   𫝪
  𡠹   㛿
-𡡎   𡞱
  𡢃   㛠
  𡮉   𡭜
  𡮣   𡭬
@@ -3720,13 +3706,12 @@
  𢯷   𪭝
  𢶒   𪭯
  𢶫   𢫞
-𢷬   𢭏
  𢷮   𢫊
  𢹿   𢬦
  𢺳   𪮳
  𣈶   暅
  𣋋   𣈣
-ð£\8d\90   ð \8a\89
+ð£\8d\90   ð«§\83
  𣙎   㭣
  𣜬   𪳗
  𣝕   𣘷
@@ -3747,6 +3732,7 @@
  𤒎   𤊀
  𤒻   𪹹
  𤓌   𪹠
+𤓎   𤎺
  𤓩   𤊰
  𤘀   𪺣
  𤛮   𤙯
@@ -4012,9 +3998,9 @@
  𪅂   𫜂
  𪆷   𫛾
  𪇳   𪉕
-ðª\88¼   ðª\89\93
+ðª\88¼   ð±\8a\9c
  𪉸   𫜊
-ðª\8b¿   ðª\8e\8d
+ðª\8b¿   ð«§®
  𪌭   𫜓
  𪍠   𫜕
  𪓰   𫜟
diff --git a/data/dictionary/TSPhrases.txt b/data/dictionary/TSPhrases.txt

index 9c2107bff484c3d15ed99679262e26db94a96c7f..dee97540c2170d612e2bc8c07417cc2387eea50b 100644 (file)
--- a/data/dictionary/TSPhrases.txt
+++ b/data/dictionary/TSPhrases.txt
@@ -33,10 +33,10 @@
  以功覆過   以功复过
  侔德覆載   侔德复载
  傢俱 家具
-傷亡枕藉   伤亡枕借
+傷亡枕藉   伤亡枕藉
  八濛山      八濛山
  凌藉 凌借
-出醜狼藉   出丑狼借
+出醜狼藉   出丑狼藉
  函覆 函复
  千鍾粟      千锺粟
  反反覆覆   反反复复
@@ -61,6 +61,7 @@
  彷徨 彷徨
  徵弦 徵弦
  徵絃 徵弦
+徵羽摩柯   徵羽摩柯
  徵聲 徵声
  徵調 徵调
  徵音 徵音
@@ -92,6 +93,7 @@
  於敖 於敖
  於梨華      於梨华
  於清言      於清言
+於潛 於潜
  於琳 於琳
  於穆 於穆
  於竹屋      於竹屋
@@ -180,7 +182,7 @@
  藉端生事   借端生事
  藉箸代籌   借箸代筹
  藉草枕塊   借草枕块
-藉藉 借借
+藉藉 藉藉
  藉藉无名   藉藉无名
  藉詞 借词
  藉讀 借读
@@ -237,7 +239,6 @@
  重覆 重复
  金吒 金吒
  金鍊 金链
-鈕釦 纽扣
  鈞覆 钧复
  鉅子 钜子
  鉅萬 钜万
diff --git a/data/dictionary/TWPhrasesIT.txt b/data/dictionary/TWPhrasesIT.txt

index 4a80ad76cc79acaea1907d275025c7e0c880ec24..d8692ecf189fbaef98be4d6c241df68f8692e8ae 100644 (file)
--- a/data/dictionary/TWPhrasesIT.txt
+++ b/data/dictionary/TWPhrasesIT.txt
@@ -106,7 +106,7 @@ U盤        隨身碟
  字體 字型
  存儲 儲存
  存盤 存檔
-宏    巨集
+å®\8f    å®\8f å·¨é\9b\86
  宏內核      單核心
  寄存器      暫存器
  密鑰 金鑰
@@ -300,6 +300,8 @@ U盤        隨身碟
  複選框      覈取方塊
  視圖 檢視
  視頻 影片 視訊
+視頻會議   視訊會議
+視頻通話   視訊通話
  解釋器      直譯器
  觸摸 觸控
  觸摸屏      觸控式螢幕
diff --git a/data/dictionary/TWPhrasesName.txt b/data/dictionary/TWPhrasesName.txt

index 6b0b3b6a0f53224b778bfaca567c5af847660123..6437a5531ec0bf8859fdd489a3f725c6814f37d3 100644 (file)
--- a/data/dictionary/TWPhrasesName.txt
+++ b/data/dictionary/TWPhrasesName.txt
@@ -17,6 +17,7 @@
  吉布堤      吉布地
  哈薩克斯坦        哈薩克
  哥斯達黎加        哥斯大黎加
+喫茶小舖   喫茶小舖
  圖瓦盧      吐瓦魯
  土庫曼斯坦        土庫曼
  圭亞那      蓋亞那
@@ -62,6 +63,7 @@
  科摩羅      葛摩
  科特迪瓦   象牙海岸
  突尼斯      突尼西亞
+純喫茶      純喫茶
  索馬里      索馬利亞
  老撾 寮國
  聖基茨和尼維斯  聖克里斯多福及尼維斯
diff --git a/data/dictionary/TWPhrasesOther.txt b/data/dictionary/TWPhrasesOther.txt

index d02ba3391a18aa701069964092a773ea5111384d..265bf1ad8755d25fef398a7f46fddbdb1ac88b10 100644 (file)
--- a/data/dictionary/TWPhrasesOther.txt
+++ b/data/dictionary/TWPhrasesOther.txt
@@ -5,11 +5,17 @@
  塑料 塑膠
  奔馳 賓士
  奶酪 乳酪
+幾率 機率
  方便麪      泡麵 速食麵
+李彥宏      李彥宏
+概率 機率
+海內存知己        海內存知己
  涼菜 冷盤
  的士 計程車
  砹    砈
  硅    矽
+程序不正義        程序不正義
+程序正義   程序正義
  空氣淨化器        空氣清淨機
  納米 奈米
  自行車      腳踏車
@@ -27,3 +33,4 @@
  鎿    錼
  鐦    鉲
  鑥    鎦
+黃宏 黃宏
diff --git a/data/dictionary/TWVariants.txt b/data/dictionary/TWVariants.txt

index 37861abd6ca0cab4130983b16b748dad4147a1eb..023a0687b6c637a96d6b157f53bb98dec00d3166 100644 (file)
--- a/data/dictionary/TWVariants.txt
+++ b/data/dictionary/TWVariants.txt
@@ -1,5 +1,4 @@
  僞    偽
-兇    凶
  啓    啟
  喫    吃
  嫺    嫻
@@ -7,7 +6,6 @@
  峯    峰
  幺    么
  擡    抬
-曬    晒
  棱    稜
  檐    簷
  污    汙
@@ -18,20 +16,24 @@
  牀    床
  痹    痺
  癡    痴
+皁    皂
  着    著
  睾    睪
+祕    秘
  竈    灶
  糉    粽
  繮    韁
  纔    才
  羣    群
-蔘    参
+脣    唇
+蔘    參
  蔿    蒍
  衆    眾
  裏    裡
  覈    核
  踊    踴
  鉢    缽
+鍼    針
  鮎    鯰
  麪    麵
  齶    顎
diff --git a/data/scheme/st_multi.txt b/data/scheme/st_multi.txt

index 681ca6a3216c22738f174abd0d5512b95a445bed..d316bbacd6e4bf2a68daec2ac36484f982a3f90c 100644 (file)
--- a/data/scheme/st_multi.txt
+++ b/data/scheme/st_multi.txt
@@ -196,3 +196,12 @@
  证    證 証 証諫、士尉以証君
  佑    佑 祐 福祉用「祐」。嘉祐 僧祐
  谥    諡 謚 「諡」用於「諡號」，「謚」見於古文。
+熏    熏 燻 「熏」可用於「煙燻」或「薰香」義。
+旋    旋 鏇 「旋」用於「旋轉」等。「鏇」用於「旋轉削切」等。
+沾    沾 霑 「雨水浸潤」、「受恩」等義用「霑」，「浸溼」等義通用，「接觸」「染上」「帶有」等義用「沾」。
+跖    跖 蹠 「腳掌」等以「蹠」為正字。「跖」可用於人名，如「盜跖」。
+玩    玩 翫 「鬆懈、輕忽」用「翫」，其餘「玩」「翫」通用。
+璇    璇 璿 星名用「璇」。「天文儀」、「美玉」義可互通。二字皆有用於人名。   天璇
+它    它 牠 對動物的第三人稱用「牠」。
+蝎    蠍 蝎 「蝎」另兼正字義為「木中蠹蟲」。
+唇    脣 唇 「嘴脣」以「脣」為正字。「唇」另義為「驚駭」，讀作zhēn。
diff --git a/node/global.gypi b/node/global.gypi

index 8640f39edb5ee9599d512f629fb435f53fa693cb..7c50dd464a453bf6c85079a21d330d19f57a8f0c 100644 (file)
--- a/node/global.gypi
+++ b/node/global.gypi
@@ -1,6 +1,6 @@
  {
    "variables": {
-    "opencc_version": "1.1.1"
+    "opencc_version": "1.1.3"
    },
    "target_defaults": {
      "defines": [
@@ -18,7 +18,7 @@
          'xcode_settings': {
            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
            'MACOSX_DEPLOYMENT_TARGET': '10.7',
-          'OTHER_CPLUSPLUSFLAGS': ["-std=c++11", "-stdlib=libc++"],
+          'OTHER_CPLUSPLUSFLAGS': ["-std=c++14", "-stdlib=libc++"],
            'OTHER_LDFLAGS': ["-stdlib=libc++"]
          }
        }],
diff --git a/node/node_opencc.gypi b/node/node_opencc.gypi

index 69daeb1122852696db6938e40659c1f370ba423e..d468247b032a42ac427a076cd699299051c324f2 100644 (file)
--- a/node/node_opencc.gypi
+++ b/node/node_opencc.gypi
@@ -6,10 +6,11 @@
        "../node/opencc.cc",
      ],
      "include_dirs": [
+      "../node",
        "../src",
        "../deps/rapidjson-1.1.0",
-      "../deps/marisa-0.2.5/include",
-      "../deps/marisa-0.2.5/lib",
+      "../deps/marisa-0.2.6/include",
+      "../deps/marisa-0.2.6/lib",
        "<!(node -e \"require('nan')\")"
      ]
    }]
diff --git a/node/opencc_config.h b/node/opencc_config.h

new file mode 100644 (file)

index 0000000..8dad448
--- /dev/null
+++ b/node/opencc_config.h
@@ -0,0 +1,21 @@
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2021 Carbo Kuo <byvoid@byvoid.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+/* #undef OPENCC_ENABLE_DARTS */
diff --git a/package-lock.json b/package-lock.json

index 4f310d075d3cbb81f8bac5dc87300fc4c4bbcc4e..9245fba775daef69f1b2880e75351e5e6e3afa74 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,1833 @@
  {
    "name": "opencc",
    "version": "1.1.1",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
    "requires": true,
+  "packages": {
+    "": {
+      "version": "1.1.1",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "nan": "^2.14.2",
+        "node-pre-gyp": "^0.14.0"
+      },
+      "devDependencies": {
+        "mocha": "^8.3.0",
+        "node-pre-gyp-github": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "15.18.3",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-15.18.3.tgz",
+      "integrity": "sha512-oHABAvvC83tPIuvUfWRaw9eLThFrCxBgywl+KvEwfTFjoCrMOfEaMh0r39+Ub/EEbV345GJiMzN+zPZ4kqOvbA==",
+      "dev": true,
+      "dependencies": {
+        "before-after-hook": "^1.1.0",
+        "btoa-lite": "^1.0.0",
+        "debug": "^3.1.0",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.0",
+        "lodash": "^4.17.4",
+        "node-fetch": "^2.1.1",
+        "universal-user-agent": "^2.0.0",
+        "url-template": "^2.0.8"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "node_modules/agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "node_modules/before-after-hook": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.4.0.tgz",
+      "integrity": "sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==",
+      "dev": true
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/btoa-lite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
+      "integrity": "sha1-M3dm2hWAEhD92VbCLpxokaudAzc=",
+      "dev": true
+    },
+    "node_modules/camelcase": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.1",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "node_modules/es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "dependencies": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dependencies": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dependencies": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.x"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "4",
+        "debug": "3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/http-proxy-agent/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/https-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "dependencies": {
+        "minimatch": "^3.0.4"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/macos-release": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
+      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.26",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.43.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "node_modules/minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dependencies": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dependencies": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz",
+      "integrity": "sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==",
+      "dev": true,
+      "dependencies": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.1",
+        "debug": "4.3.1",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.1.6",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "4.0.0",
+        "log-symbols": "4.0.0",
+        "minimatch": "3.0.4",
+        "ms": "2.1.3",
+        "nanoid": "3.1.20",
+        "serialize-javascript": "5.0.1",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "which": "2.0.2",
+        "wide-align": "1.1.3",
+        "workerpool": "6.1.0",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
+    },
+    "node_modules/nanoid": {
+      "version": "3.1.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/needle": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz",
+      "integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==",
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/node-pre-gyp": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz",
+      "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
+      "dependencies": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "needle": "^2.2.1",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4.4.2"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/node-pre-gyp-github": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp-github/-/node-pre-gyp-github-1.4.3.tgz",
+      "integrity": "sha512-tnJ0iZgzIZnZl7VBgebPYdzOe98dxMnQeDs6+yX1WVdt6IiWu0l4EYes3IY7ZIokRbtJ4iJjqwgGIyQrdfDJSg==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/rest": "^15.9.5",
+        "commander": "^2.17.0",
+        "mime-types": "^2.1.19"
+      },
+      "bin": {
+        "node-pre-gyp-github": "bin/node-pre-gyp-github.js"
+      }
+    },
+    "node_modules/node-pre-gyp-github/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "dependencies": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "dependencies": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+    },
+    "node_modules/npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "dependencies": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dependencies": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-name": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "dev": true,
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=4.5"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.1.0.tgz",
+      "integrity": "sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==",
+      "dev": true,
+      "dependencies": {
+        "os-name": "^3.0.0"
+      }
+    },
+    "node_modules/url-template": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
+      "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE=",
+      "dev": true
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/windows-release": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz",
+      "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "node_modules/y18n": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
    "dependencies": {
      "@octokit/rest": {
        "version": "15.18.3",
@@ -38,6 +1863,12 @@
          }
        }
      },
+    "@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
      "abbrev": {
        "version": "1.1.1",
        "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -53,9 +1884,9 @@
        }
      },
      "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
        "dev": true
      },
      "ansi-regex": {
@@ -64,12 +1895,12 @@
        "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
      },
      "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
        "dev": true,
        "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
        }
      },
      "anymatch": {
@@ -97,13 +1928,10 @@
        }
      },
      "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
      },
      "balanced-match": {
        "version": "1.0.0",
@@ -117,9 +1945,9 @@
        "dev": true
      },
      "binary-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
        "dev": true
      },
      "brace-expansion": {
@@ -153,47 +1981,46 @@
        "dev": true
      },
      "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
        "dev": true
      },
      "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
        "dev": true,
        "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
        },
        "dependencies": {
          "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
            "dev": true,
            "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
            }
          }
        }
      },
      "chokidar": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
-      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
        "dev": true,
        "requires": {
          "anymatch": "~3.1.1",
          "braces": "~3.0.2",
-        "fsevents": "~2.1.1",
+        "fsevents": "~2.3.1",
          "glob-parent": "~5.1.0",
          "is-binary-path": "~2.1.0",
          "is-glob": "~4.0.1",
          "normalize-path": "~3.0.0",
-        "readdirp": "~3.2.0"
+        "readdirp": "~3.5.0"
        }
      },
      "chownr": {
@@ -202,46 +2029,46 @@
        "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
      },
      "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
        "dev": true,
        "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
        },
        "dependencies": {
          "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
            "dev": true
          },
          "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
            "dev": true
          },
          "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
            "dev": true,
            "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
            }
          },
          "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
            "dev": true,
            "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
            }
          }
        }
@@ -252,18 +2079,18 @@
        "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
      },
      "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
        "dev": true,
        "requires": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
        }
      },
      "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
        "dev": true
      },
      "concat-map": {
@@ -310,9 +2137,9 @@
        }
      },
      "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
        "dev": true
      },
      "deep-extend": {
@@ -320,15 +2147,6 @@
        "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
        "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
      },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
      "delegates": {
        "version": "1.0.0",
        "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -340,15 +2158,15 @@
        "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
      },
      "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
        "dev": true
      },
      "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
        "dev": true
      },
      "end-of-stream": {
@@ -360,36 +2178,6 @@
          "once": "^1.4.0"
        }
      },
-    "es-abstract": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
      "es6-promise": {
        "version": "4.2.8",
        "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
@@ -405,16 +2193,16 @@
          "es6-promise": "^4.0.3"
        }
      },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
        "dev": true
      },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
        "dev": true
      },
      "execa": {
@@ -442,22 +2230,20 @@
        }
      },
      "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
        "dev": true,
        "requires": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
        }
      },
      "flat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "~2.0.3"
-      }
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
      },
      "fs-minipass": {
        "version": "1.2.7",
@@ -473,18 +2259,12 @@
        "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
      },
      "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
        "dev": true,
        "optional": true
      },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
      "gauge": {
        "version": "2.7.4",
        "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -543,25 +2323,10 @@
        "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
        "dev": true
      },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
      "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
        "dev": true
      },
      "has-unicode": {
@@ -654,9 +2419,9 @@
        "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
      },
      "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
      },
      "is-binary-path": {
        "version": "2.1.0",
@@ -667,24 +2432,6 @@
          "binary-extensions": "^2.0.0"
        }
      },
-    "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
      "is-extglob": {
        "version": "2.1.1",
        "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -714,14 +2461,11 @@
        "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
        "dev": true
      },
-    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
+    "is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true
      },
      "is-stream": {
        "version": "1.1.0",
@@ -729,15 +2473,6 @@
        "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
        "dev": true
      },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
      "isarray": {
        "version": "1.0.0",
        "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -750,38 +2485,36 @@
        "dev": true
      },
      "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
        "dev": true,
        "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
        }
      },
      "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
        "dev": true,
        "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^5.0.0"
        }
      },
      "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
        "dev": true
      },
      "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
        "dev": true,
        "requires": {
-        "chalk": "^2.4.2"
+        "chalk": "^4.0.0"
        }
      },
      "macos-release": {
@@ -844,56 +2577,75 @@
        }
      },
      "mocha": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz",
-      "integrity": "sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz",
+      "integrity": "sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==",
        "dev": true,
        "requires": {
-        "ansi-colors": "3.2.3",
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
          "browser-stdout": "1.3.1",
-        "chokidar": "3.3.0",
-        "debug": "3.2.6",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "3.0.0",
-        "glob": "7.1.3",
+        "chokidar": "3.5.1",
+        "debug": "4.3.1",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.1.6",
          "growl": "1.10.5",
          "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "3.0.0",
+        "js-yaml": "4.0.0",
+        "log-symbols": "4.0.0",
          "minimatch": "3.0.4",
-        "mkdirp": "0.5.5",
-        "ms": "2.1.1",
-        "node-environment-flags": "1.0.6",
-        "object.assign": "4.1.0",
-        "strip-json-comments": "2.0.1",
-        "supports-color": "6.0.0",
-        "which": "1.3.1",
+        "ms": "2.1.3",
+        "nanoid": "3.1.20",
+        "serialize-javascript": "5.0.1",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "which": "2.0.2",
          "wide-align": "1.1.3",
-        "yargs": "13.3.2",
-        "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.0"
+        "workerpool": "6.1.0",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
        },
        "dependencies": {
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
            "dev": true,
            "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "ms": "2.1.2"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+              "dev": true
+            }
            }
          },
          "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
            "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
          }
        }
      },
@@ -904,9 +2656,15 @@
        "dev": true
      },
      "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
+    },
+    "nanoid": {
+      "version": "3.1.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+      "dev": true
      },
      "needle": {
        "version": "2.4.1",
@@ -924,20 +2682,10 @@
        "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
        "dev": true
      },
-    "node-environment-flags": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
-    },
      "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
        "dev": true
      },
      "node-pre-gyp": {
@@ -1044,40 +2792,6 @@
        "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
        "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
      },
-    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
      "once": {
        "version": "1.4.0",
        "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1122,33 +2836,27 @@
        "dev": true
      },
      "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
        "dev": true,
        "requires": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
        }
      },
      "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
        "dev": true,
        "requires": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^3.0.2"
        }
      },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
      "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
        "dev": true
      },
      "path-is-absolute": {
@@ -1183,6 +2891,15 @@
          "once": "^1.3.1"
        }
      },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
      "rc": {
        "version": "1.2.8",
        "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -1209,12 +2926,12 @@
        }
      },
      "readdirp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
        "dev": true,
        "requires": {
-        "picomatch": "^2.0.4"
+        "picomatch": "^2.2.1"
        }
      },
      "require-directory": {
@@ -1223,12 +2940,6 @@
        "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
        "dev": true
      },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
      "rimraf": {
        "version": "2.7.1",
        "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -1257,6 +2968,15 @@
        "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
        "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
      },
+    "serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
      "set-blocking": {
        "version": "2.0.0",
        "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -1282,11 +3002,13 @@
        "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
        "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
      },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
      },
      "string-width": {
        "version": "1.0.2",
@@ -1298,56 +3020,6 @@
          "strip-ansi": "^3.0.0"
        }
      },
-    "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimstart": "^1.0.0"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimend": "^1.0.0"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
      "strip-ansi": {
        "version": "3.0.1",
        "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -1368,12 +3040,12 @@
        "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
      },
      "supports-color": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
        "dev": true,
        "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
        }
      },
      "tar": {
@@ -1428,12 +3100,6 @@
          "isexe": "^2.0.0"
        }
      },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
      "wide-align": {
        "version": "1.1.3",
        "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -1451,47 +3117,53 @@
          "execa": "^1.0.0"
        }
      },
+    "workerpool": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+      "dev": true
+    },
      "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
        "dev": true,
        "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
        },
        "dependencies": {
          "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
            "dev": true
          },
          "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
            "dev": true
          },
          "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
            "dev": true,
            "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
            }
          },
          "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
            "dev": true,
            "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
            }
          }
        }
@@ -1502,9 +3174,9 @@
        "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
      },
      "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
        "dev": true
      },
      "yallist": {
@@ -1513,77 +3185,77 @@
        "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
      },
      "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
        "dev": true,
        "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
          "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
        },
        "dependencies": {
          "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
            "dev": true
          },
          "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
            "dev": true
          },
          "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
            "dev": true,
            "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
            }
          },
          "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
            "dev": true,
            "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
            }
          }
        }
      },
      "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true
      },
      "yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
        "dev": true,
        "requires": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
        }
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
      }
    }
  }
diff --git a/package.json b/package.json

index ab67ded41d0af748032e3a47173a56467f9a68e4..f64533698b04ae5a95fad97773dcf08d3b867fac 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
  {
    "name": "opencc",
-  "version": "1.1.1",
+  "version": "1.1.3",
    "description": "Conversion between Traditional and Simplified Chinese",
    "author": "Carbo Kuo <byvoid@byvoid.com>",
    "license": "Apache-2.0",
@@ -37,11 +37,11 @@
      "Traditional Chinese"
    ],
    "devDependencies": {
-    "mocha": "^7.1.2",
+    "mocha": "^8.3.0",
      "node-pre-gyp-github": "^1.4.3"
    },
    "dependencies": {
-    "nan": "^2.14.1",
+    "nan": "^2.14.2",
      "node-pre-gyp": "^0.14.0"
    }
  }
diff --git a/python/Dockerfile.posix b/python/Dockerfile.posix

deleted file mode 100644 (file)

index c145a04..0000000
--- a/python/Dockerfile.posix
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM continuumio/miniconda:latest
-COPY . /opt/OpenCC
-WORKDIR /opt/OpenCC
-
-RUN apt update && \
-    apt install -y g++ make cmake && \
-    apt autoremove -y && \
-    apt autoclean -y
-RUN make clean && make python-install && make clean
diff --git a/release-pypi-linux.sh b/release-pypi-linux.sh

new file mode 100644 (file)

index 0000000..c74f8d0
--- /dev/null
+++ b/release-pypi-linux.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+set -e
+
+# Different to release-pypi-win.cmd and release-pypi-osx.sh,
+# this script has to be ran from a clean dockerfile
+
+# Random note: The reason why this script is being ran from within a container
+# is to ensure glibc compatibility. From what I've seen so far, it appears
+# that having multiple glibc versions is a somewhat convoluted process
+# and I don't trust myself to be able to manage them well.
+
+# Download dependenciess
+export DEBIAN_FRONTEND=noninteractive
+apt update
+apt upgrade -y
+apt install -y g++ make curl
+
+cd /opt/OpenCC
+
+# Download and init conda
+MINICONDA_FILENAME=Miniconda3-latest-Linux-x86_64.sh
+curl -L -o $MINICONDA_FILENAME \
+    "https://repo.continuum.io/miniconda/$MINICONDA_FILENAME"
+bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3
+export PATH=$HOME/miniconda3/bin:$PATH
+eval "$(conda shell.bash hook)"
+
+for VERSION in 2.7 3.5 3.6 3.7 3.8 3.9; do
+    # Create and activate environment
+    conda create -y -n py$VERSION python=$VERSION
+    conda activate py$VERSION
+
+    # Build and package
+    pip install --no-cache-dir setuptools wheel cmake
+    python setup.py build_ext bdist_wheel \
+        --plat-name manylinux1_x86_64
+
+    # Cleanup
+    conda deactivate
+    rm -rf build python/opencc/clib OpenCC.egg-info
+done
+
+# Upload to PyPI
+conda activate py3.8
+python -m pip install twine
+python -m twine upload dist/*
diff --git a/release-pypi-macos.sh b/release-pypi-macos.sh

new file mode 100644 (file)

index 0000000..e8d958f
--- /dev/null
+++ b/release-pypi-macos.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+# Different to release-pypi-win.cmd and release-pypi-osx.sh,
+# this script has to be ran from a clean dockerfile
+
+# Download and init conda
+MINICONDA_FILENAME=Miniconda3-latest-MacOSX-x86_64.sh
+curl -L -o $MINICONDA_FILENAME \
+    "https://repo.continuum.io/miniconda/$MINICONDA_FILENAME"
+bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3
+export PATH=$HOME/miniconda3/bin:$PATH
+eval "$(conda shell.bash hook)"
+
+for VERSION in 2.7 3.5 3.6 3.7 3.8 3.9; do
+    # Create and activate environment
+    conda create -y -n py$VERSION python=$VERSION
+    conda activate py$VERSION
+
+    # Build and package
+    pip install --no-cache-dir setuptools wheel
+    python setup.py build_ext bdist_wheel
+
+    # Cleanup
+    conda deactivate
+    rm -rf build python/opencc/clib OpenCC.egg-info
+done
+
+# Upload to PyPI
+conda activate py3.8
+python -m pip install twine
+python -m twine upload dist/*
diff --git a/release-pypi-windows.cmd b/release-pypi-windows.cmd

new file mode 100644 (file)

index 0000000..5bcbc2b
--- /dev/null
+++ b/release-pypi-windows.cmd
@@ -0,0 +1,32 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+SET VERSIONS=2.7 3.5 3.6 3.7 3.8 3.9
+SET SOURCEDIR=%cd%
+
+REM Build packages
+for %%v in (%VERSIONS%) do (
+    SET ENV_NAME=py%%v
+
+    REM Create and activate environment
+    cd %ROOT_DIR%
+    CALL C:\Miniconda/condabin/conda.bat create -y -n py%%v python=%%v
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+    CALL C:\Miniconda/condabin/conda.bat activate py%%v
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+    pip install --no-cache-dir setuptools wheel pytest
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+
+    REM Build and package
+    python setup.py build_ext bdist_wheel
+    if !ERRORLEVEL! NEQ 0 (EXIT !ERRORLEVEL!)
+
+    REM Cleanup
+    CALL C:\Miniconda/condabin/conda.bat deactivate
+    rmdir /S /Q build python\opencc\clib OpenCC.egg-info
+)
+
+REM Upload to PyPI
+C:\Miniconda/condabin/conda.bat activate py3.8
+python -m pip install twine
+python -m twine upload dist/*
diff --git a/src/BinaryDict.cpp b/src/BinaryDict.cpp

index 2e66fd2b517b710640f5d69f66d7ad24313ef7b4..c577566150e936be574474a0f90ba126b05740a4 100644 (file)
--- a/src/BinaryDict.cpp
+++ b/src/BinaryDict.cpp
@@ -67,6 +67,12 @@ void BinaryDict::SerializeToFile(FILE* fp) const {
  }
  
  BinaryDictPtr BinaryDict::NewFromFile(FILE* fp) {
+  size_t offsetBound, savedOffset;
+  savedOffset = ftell(fp);
+  fseek(fp, 0L, SEEK_END);
+  offsetBound = ftell(fp) - savedOffset;
+  fseek(fp, savedOffset, SEEK_SET);
+
    BinaryDictPtr dict(new BinaryDict(LexiconPtr(new Lexicon)));
  
    // Number of items
@@ -113,7 +119,7 @@ BinaryDictPtr BinaryDict::NewFromFile(FILE* fp) {
      // Key offset
      size_t keyOffset;
      unitsRead = fread(&keyOffset, sizeof(size_t), 1, fp);
-    if (unitsRead != 1) {
+    if (unitsRead != 1 || keyOffset >= offsetBound) {
        throw InvalidFormat("Invalid OpenCC binary dictionary (keyOffset)");
      }
      std::string key = dict->keyBuffer.c_str() + keyOffset;
@@ -122,7 +128,7 @@ BinaryDictPtr BinaryDict::NewFromFile(FILE* fp) {
      for (size_t j = 0; j < numValues; j++) {
        size_t valueOffset;
        unitsRead = fread(&valueOffset, sizeof(size_t), 1, fp);
-      if (unitsRead != 1) {
+      if (unitsRead != 1 || valueOffset >= offsetBound) {
          throw InvalidFormat("Invalid OpenCC binary dictionary (valueOffset)");
        }
        const char* value = dict->valueBuffer.c_str() + valueOffset;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index 488399066db049880d1b623aa3e8d34231bb284d..11d14e4b4c41109b527b77535c6feb50b8412f5e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,17 @@
  include (GenerateExportHeader)
-include_directories(../deps/marisa-0.2.5/include)
-include_directories(../deps/rapidjson-1.1.0)
-include_directories(../deps/tclap-1.2.2)
+
+include_directories("${PROJECT_BINARY_DIR}/src")
+include_directories("${PROJECT_SOURCE_DIR}/src")
+
+if(NOT USE_SYSTEM_MARISA)
+  include_directories(../deps/marisa-0.2.6/include)
+endif()
+if(NOT USE_SYSTEM_RAPIDJSON)
+  include_directories(../deps/rapidjson-1.1.0)
+endif()
+if(NOT USE_SYSTEM_TCLAP)
+  include_directories(../deps/tclap-1.2.2)
+endif()
  
  # Library
  
@@ -32,6 +42,7 @@ set(
    UTF8StringSlice.hpp
    UTF8Util.hpp
    opencc.h
+  "${PROJECT_BINARY_DIR}/src/opencc_config.h"
  )
  
  set(
@@ -72,7 +83,10 @@ set(UNITTESTS
  )
  
  if (ENABLE_DARTS)
-  include_directories(../deps/darts-clone)
+  set(OPENCC_ENABLE_DARTS 1)
+  if(NOT USE_SYSTEM_DARTS)
+    include_directories(../deps/darts-clone)
+  endif()
    set(
      LIBOPENCC_HEADERS
      ${LIBOPENCC_HEADERS}
@@ -93,6 +107,10 @@ if (ENABLE_DARTS)
    )
  endif()
  
+configure_file(
+  "${PROJECT_SOURCE_DIR}/src/opencc_config.h.in"
+  "${PROJECT_BINARY_DIR}/src/opencc_config.h")
+
  add_library(libopencc ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
  set_target_properties(libopencc PROPERTIES POSITION_INDEPENDENT_CODE ON)
  source_group(libopencc FILES ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
@@ -114,7 +132,7 @@ set_target_properties(
      OUTPUT_NAME
        opencc
      VERSION
-      1.1.1
+      1.1.3
      SOVERSION
        1.1
  )
@@ -140,12 +158,12 @@ if (ENABLE_GTEST)
      add_custom_target(
          copy_gtest_to_src
          ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Copy gtest"
+      COMMENT "Copying gtest to src"
      )
      add_custom_target(
          copy_gtest_main_to_src
          ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Copy gtest_main"
+      COMMENT "Copying gtest_main to src"
      )
    endif()
  
diff --git a/src/Common.hpp b/src/Common.hpp

index 8d4e2f065207d4dc613da34b4e422e529ece975d..067966b55386cafcad2d8d631d0b57319474c383 100644 (file)
--- a/src/Common.hpp
+++ b/src/Common.hpp
@@ -30,6 +30,7 @@
  
  #include "Export.hpp"
  #include "Optional.hpp"
+#include "opencc_config.h"
  
  // Forward decalarations and alias
  namespace opencc {
@@ -61,7 +62,7 @@ typedef std::shared_ptr<Segments> SegmentsPtr;
  typedef std::shared_ptr<SerializableDict> SerializableDictPtr;
  typedef std::shared_ptr<TextDict> TextDictPtr;
  
-#ifdef ENABLE_DARTS
+#ifdef OPENCC_ENABLE_DARTS
  class BinaryDict;
  class DartsDict;
  typedef std::shared_ptr<BinaryDict> BinaryDictPtr;
@@ -79,6 +80,3 @@ const std::string PACKAGE_DATA_DIRECTORY = PKGDATADIR "/";
  #ifndef VERSION
  #define VERSION "1.0.*"
  #endif // ifndef VERSION
-
-// The following definitions are provided by CMake
-// #define ENABLE_DARTS
diff --git a/src/Config.cpp b/src/Config.cpp

index 021095f8e8a02921e7991830750a7f222b8bdabb..a3a36b64699d97b4726f998ffcf9011c6673fb36 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -20,7 +20,7 @@
  #include <list>
  #include <unordered_map>
  
-#include "document.h"
+#include <rapidjson/document.h>
  
  #include "Config.hpp"
  #include "ConversionChain.hpp"
@@ -255,10 +255,14 @@ ConverterPtr Config::NewFromString(const std::string& json,
    }
  
    ConfigInternal* impl = (ConfigInternal*)internal;
-  if (configDirectory.back() == '/' || configDirectory.back() == '\\')
-    impl->configDirectory = configDirectory;
-  else
-    impl->configDirectory = configDirectory + '/';
+  if (!configDirectory.empty()) {
+    if (configDirectory.back() == '/' || configDirectory.back() == '\\')
+      impl->configDirectory = configDirectory;
+    else
+      impl->configDirectory = configDirectory + '/';
+  } else {
+    impl->configDirectory.clear();
+  }
  
    // Required: segmentation
    SegmentationPtr segmentation =
diff --git a/src/ConversionChainTest.cpp b/src/ConversionChainTest.cpp

index 5b453592a1f717ccb6dca07bdf55c2524cecf462..65e076603fc8cfb76fda55fab1d38c8d667405cf 100644 (file)
--- a/src/ConversionChainTest.cpp
+++ b/src/ConversionChainTest.cpp
@@ -1,7 +1,7 @@
  /*
   * Open Chinese Convert
   *
- * Copyright 2015 Carbo Kuo <byvoid@byvoid.com>
+ * Copyright 2015-2021 Carbo Kuo <byvoid@byvoid.com>
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@ protected:
      const size_t length = expected->Length();
      EXPECT_TRUE(length == actual->Length());
      for (size_t i = 0; i < length; i++) {
-      EXPECT_EQ(std::string(expected->At(i)), std::string(actual->At(i)));
+      EXPECT_EQ(std::string(expected->At(i)), std::string(actual->At(i)))
+          << "i = " << i;
      }
    }
  
diff --git a/src/DartsDict.cpp b/src/DartsDict.cpp

index c91d7715825d43724815c68c935d37d920a7c530..af790b18d9814a08f3b3b9def0ad58099b9bc712 100644 (file)
--- a/src/DartsDict.cpp
+++ b/src/DartsDict.cpp
@@ -54,10 +54,13 @@ size_t DartsDict::KeyMaxLength() const { return maxLength; }
  
  Optional<const DictEntry*> DartsDict::Match(const char* word,
                                              size_t len) const {
+  if (len > maxLength) {
+    return Optional<const DictEntry*>::Null();
+  }
    Darts::DoubleArray& dict = *internal->doubleArray;
    Darts::DoubleArray::result_pair_type result;
  
-  dict.exactMatchSearch(word, result, (std::min)(maxLength, len));
+  dict.exactMatchSearch(word, result, len);
    if (result.value != -1) {
      return Optional<const DictEntry*>(
          lexicon->At(static_cast<size_t>(result.value)));
diff --git a/src/DartsDictTest.cpp b/src/DartsDictTest.cpp

index d50cae67ca9a6fcac290a1271f4e7a196ef54b7c..c1742203cf79e4870e2727a1f9a9fa0f2e9980dc 100644 (file)
--- a/src/DartsDictTest.cpp
+++ b/src/DartsDictTest.cpp
@@ -17,6 +17,7 @@
   */
  
  #include "DartsDict.hpp"
+#include "TestUtilsUTF8.hpp"
  #include "TextDictTestBase.hpp"
  
  namespace opencc {
@@ -56,4 +57,15 @@ TEST_F(DartsDictTest, Deserialization) {
    TestDict(deserializedTextDict);
  }
  
+TEST_F(DartsDictTest, ExactMatch) {
+  auto there = dartsDict->Match("積羽沉舟", 12);
+  EXPECT_FALSE(there.IsNull());
+  auto dictEntry = there.Get();
+  EXPECT_EQ(1, dictEntry->NumValues());
+  EXPECT_EQ(utf8("羣輕折軸"), dictEntry->GetDefault());
+
+  auto nowhere = dartsDict->Match("積羽沉舟衆口鑠金", 24);
+  EXPECT_TRUE(nowhere.IsNull());
+}
+
  } // namespace opencc
diff --git a/src/Dict.hpp b/src/Dict.hpp

index 461d6d24c176e0fbefc7c022e8e71e300d443fba..1c810346c17ec7b710434890760bd693e17e2956 100644 (file)
--- a/src/Dict.hpp
+++ b/src/Dict.hpp
@@ -49,6 +49,13 @@ public:
    virtual Optional<const DictEntry*> MatchPrefix(const char* word,
                                                   size_t len) const;
  
+  /**
+   * Matches the longest matched prefix of a word.
+   */
+  Optional<const DictEntry*> MatchPrefix(const char* word) const {
+    return MatchPrefix(word, KeyMaxLength());
+  }
+
    /**
     * Matches the longest matched prefix of a word.
     */
diff --git a/src/DictGroup.cpp b/src/DictGroup.cpp

index 4ca9e3363da387b9e264c4c1e6d6d98992ea60ad..1f4303532fdb26b622fb194f574c50f4f08a6d2e 100644 (file)
--- a/src/DictGroup.cpp
+++ b/src/DictGroup.cpp
@@ -1,7 +1,7 @@
  /*
   * Open Chinese Convert
   *
- * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
+ * Copyright 2010-2021 Carbo Kuo <byvoid@byvoid.com>
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
   * limitations under the License.
   */
  
+#include <algorithm>
  #include <map>
  
  #include "DictGroup.hpp"
@@ -24,8 +25,20 @@
  
  using namespace opencc;
  
+namespace {
+
+size_t GetKeyMaxLength(const std::list<DictPtr>& dicts) {
+  size_t keyMaxLength = 0;
+  for (const DictPtr& dict : dicts) {
+    keyMaxLength = (std::max)(keyMaxLength, dict->KeyMaxLength());
+  }
+  return keyMaxLength;
+}
+
+} // namespace
+
  DictGroup::DictGroup(const std::list<DictPtr>& _dicts)
-    : keyMaxLength(0), dicts(_dicts) {}
+    : keyMaxLength(GetKeyMaxLength(_dicts)), dicts(_dicts) {}
  
  DictGroup::~DictGroup() {}
  
diff --git a/src/DictGroupTest.cpp b/src/DictGroupTest.cpp

index 7003506c291a2cf576e34f92e65c4e9dcc72272b..c91731ed18e112e5523644fd503212ccf9a8f385 100644 (file)
--- a/src/DictGroupTest.cpp
+++ b/src/DictGroupTest.cpp
@@ -1,7 +1,7 @@
  /*
   * Open Chinese Convert
   *
- * Copyright 2015 Carbo Kuo <byvoid@byvoid.com>
+ * Copyright 2015-2021 Carbo Kuo <byvoid@byvoid.com>
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -25,15 +25,31 @@ protected:
    DictGroupTest() {}
  };
  
-TEST_F(DictGroupTest, SimpleGroupTest) {
+TEST_F(DictGroupTest, KeyMaxLength) {
    const DictGroupPtr& dictGroup = CreateDictGroupForConversion();
-  const auto& entry = dictGroup->Dict::MatchPrefix(utf8("Unknown"));
-  EXPECT_TRUE(entry.IsNull());
+  EXPECT_EQ(6, dictGroup->KeyMaxLength());
+  EXPECT_EQ(6, dictGroup->GetDicts().front()->KeyMaxLength());
+  EXPECT_EQ(3, dictGroup->GetDicts().back()->KeyMaxLength());
+}
  
-  const auto& matches = dictGroup->Dict::MatchAllPrefixes(utf8("干燥"));
-  EXPECT_EQ(2, matches.size());
-  EXPECT_EQ(utf8("乾燥"), matches.at(0)->GetDefault());
-  EXPECT_EQ(utf8("幹"), matches.at(1)->GetDefault());
+TEST_F(DictGroupTest, SimpleGroupTest) {
+  const DictGroupPtr& dictGroup = CreateDictGroupForConversion();
+  {
+    const auto& entry = dictGroup->Dict::MatchPrefix(utf8("Unknown"));
+    EXPECT_TRUE(entry.IsNull());
+  }
+  {
+    const auto& entry = dictGroup->Dict::MatchPrefix(utf8("里面"));
+    EXPECT_FALSE(entry.IsNull());
+    EXPECT_EQ(3, entry.Get()->KeyLength());
+    EXPECT_EQ(utf8("裏"), entry.Get()->GetDefault());
+  }
+  {
+    const auto& matches = dictGroup->Dict::MatchAllPrefixes(utf8("干燥"));
+    EXPECT_EQ(2, matches.size());
+    EXPECT_EQ(utf8("乾燥"), matches.at(0)->GetDefault());
+    EXPECT_EQ(utf8("幹"), matches.at(1)->GetDefault());
+  }
  }
  
  TEST_F(DictGroupTest, TaiwanPhraseGroupTest) {
diff --git a/src/Lexicon.cpp b/src/Lexicon.cpp

index c3caf66be5fd5da5dcf4496ae1206361959fbf46..a3612455538928ec5cae04950f505194c910cd25 100644 (file)
--- a/src/Lexicon.cpp
+++ b/src/Lexicon.cpp
@@ -30,4 +30,13 @@ bool Lexicon::IsSorted() {
                          DictEntry::UPtrLessThan);
  }
  
+bool Lexicon::IsUnique() {
+  for (size_t i = 1; i < entries.size(); ++i) {
+    if (entries[i - 1]->Key() == entries[i]->Key()) {
+      return false;
+    }
+  }
+  return true;
+}
+
  } // namespace opencc
diff --git a/src/Lexicon.hpp b/src/Lexicon.hpp

index 83d1bc25875e7e3382f4b62dd6805ede8cce695f..bb8724c4ad768493365ff01a0bb35ec8c5824e10 100644 (file)
--- a/src/Lexicon.hpp
+++ b/src/Lexicon.hpp
@@ -43,8 +43,12 @@ public:
  
    void Sort();
  
+  // Returns true if the lexicon is sorted by key.
    bool IsSorted();
  
+  // Returns true if every key unique (after sorted).
+  bool IsUnique();
+
    const DictEntry* At(size_t index) const { return entries.at(index).get(); }
  
    size_t Length() const { return entries.size(); }
diff --git a/src/MarisaDict.cpp b/src/MarisaDict.cpp

index d01dd521dfd2a93eca7a3be5dd1d0a3b490c2b7c..0936f2f56f4de800d06bd55c4e061064131d460a 100644 (file)
--- a/src/MarisaDict.cpp
+++ b/src/MarisaDict.cpp
@@ -47,9 +47,12 @@ size_t MarisaDict::KeyMaxLength() const { return maxLength; }
  
  Optional<const DictEntry*> MarisaDict::Match(const char* word,
                                               size_t len) const {
+  if (len > maxLength) {
+    return Optional<const DictEntry*>::Null();
+  }
    const marisa::Trie& trie = *internal->marisa;
    marisa::Agent agent;
-  agent.set_query(word, (std::min)(maxLength, len));
+  agent.set_query(word, len);
    if (trie.lookup(agent)) {
      return Optional<const DictEntry*>(lexicon->At(agent.key().id()));
    } else {
diff --git a/src/MarisaDictTest.cpp b/src/MarisaDictTest.cpp

index f1c88a1bc1f4ceae20ede7dc350c5131c6312b80..66036a4181621c04c2332a9da142e35a29a73b50 100644 (file)
--- a/src/MarisaDictTest.cpp
+++ b/src/MarisaDictTest.cpp
@@ -1,7 +1,7 @@
  /*
   * Open Chinese Convert
   *
- * Copyright 2020 Carbo Kuo <byvoid@byvoid.com>
+ * Copyright 2020-2021 Carbo Kuo <byvoid@byvoid.com>
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
   */
  
  #include "MarisaDict.hpp"
+#include "TestUtilsUTF8.hpp"
  #include "TextDictTestBase.hpp"
  
  namespace opencc {
@@ -52,4 +53,42 @@ TEST_F(MarisaDictTest, Deserialization) {
    }
  }
  
+TEST_F(MarisaDictTest, ExactMatch) {
+  auto there = dict->Match("積羽沉舟", 12);
+  EXPECT_FALSE(there.IsNull());
+  auto dictEntry = there.Get();
+  EXPECT_EQ(1, dictEntry->NumValues());
+  EXPECT_EQ(utf8("羣輕折軸"), dictEntry->GetDefault());
+
+  auto nowhere = dict->Match("積羽沉舟衆口鑠金", 24);
+  EXPECT_TRUE(nowhere.IsNull());
+}
+
+TEST_F(MarisaDictTest, MatchPrefix) {
+  {
+    auto there = dict->MatchPrefix("清華", 3);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsing"), dictEntry->GetDefault());
+  }
+  {
+    auto there = dict->MatchPrefix("清華", 5);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsing"), dictEntry->GetDefault());
+  }
+  {
+    auto there = dict->MatchPrefix("清華", 6);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsinghua"), dictEntry->GetDefault());
+  }
+  {
+    auto there = dict->MatchPrefix("清華", 100);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsinghua"), dictEntry->GetDefault());
+  }
+}
+
  } // namespace opencc
diff --git a/src/PhraseExtract.cpp b/src/PhraseExtract.cpp

index 69c21bbaa568ea25b9287ffe54fe9551d97cb45c..a9a62466b0b8835eab77c15ee2943a2cd86c1359 100644 (file)
--- a/src/PhraseExtract.cpp
+++ b/src/PhraseExtract.cpp
@@ -101,7 +101,7 @@ private:
    void BuildTrie() {
      std::unordered_map<std::string, int> key_item_id_map;
      marisa::Keyset keyset;
-    for (int i = 0; i < items.size(); i++) {
+    for (size_t i = 0; i < items.size(); i++) {
        const auto& key = items[i].first;
        key_item_id_map[key.ToString()] = i;
        keyset.push_back(key.CString(), key.ByteLength());
diff --git a/src/SimpleConverter.hpp b/src/SimpleConverter.hpp

index 083bb06ea03815d1f99e21a9b388599119c978ad..206edea740f0155a767653b9c8ebf4d64138b5f9 100644 (file)
--- a/src/SimpleConverter.hpp
+++ b/src/SimpleConverter.hpp
@@ -16,8 +16,8 @@
   * limitations under the License.
   */
  
-#include <string>
  #include "Export.hpp"
+#include <string>
  
  #ifndef __OPENCC_SIMPLECONVERTER_HPP_
  #define __OPENCC_SIMPLECONVERTER_HPP_
diff --git a/src/TextDict.cpp b/src/TextDict.cpp

index e0821129ed2c3518d566937e4266589dfa4b1fc0..d256850e352b912423a1781c9dafb7be8d75dcf8 100644 (file)
--- a/src/TextDict.cpp
+++ b/src/TextDict.cpp
@@ -75,6 +75,7 @@ static LexiconPtr ParseLexiconFromFile(FILE* fp) {
  TextDict::TextDict(const LexiconPtr& _lexicon)
      : maxLength(GetKeyMaxLength(_lexicon)), lexicon(_lexicon) {
    assert(lexicon->IsSorted());
+  assert(lexicon->IsUnique());
  }
  
  TextDict::~TextDict() {}
@@ -87,6 +88,9 @@ TextDictPtr TextDict::NewFromSortedFile(FILE* fp) {
  TextDictPtr TextDict::NewFromFile(FILE* fp) {
    const LexiconPtr& lexicon = ParseLexiconFromFile(fp);
    lexicon->Sort();
+  if (!lexicon->IsUnique()) {
+    throw InvalidFormat("The text dictionary contains duplicated keys.");
+  }
    return TextDictPtr(new TextDict(lexicon));
  }
  
diff --git a/src/TextDictTest.cpp b/src/TextDictTest.cpp

index 2d1455b69b0d8b9f940c369528d91b44f59f990f..e0dff7943435939bb500fc2cf8bec7f21eb793cb 100644 (file)
--- a/src/TextDictTest.cpp
+++ b/src/TextDictTest.cpp
@@ -1,7 +1,7 @@
  /*
   * Open Chinese Convert
   *
- * Copyright 2015 Carbo Kuo <byvoid@byvoid.com>
+ * Copyright 2015-2021 Carbo Kuo <byvoid@byvoid.com>
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
   * limitations under the License.
   */
  
+#include "TestUtilsUTF8.hpp"
  #include "TextDictTestBase.hpp"
  
  namespace opencc {
@@ -39,4 +40,42 @@ TEST_F(TextDictTest, Deserialization) {
    TestDict(deserialized);
  }
  
+TEST_F(TextDictTest, ExactMatch) {
+  auto there = textDict->Match("積羽沉舟", 12);
+  EXPECT_FALSE(there.IsNull());
+  auto dictEntry = there.Get();
+  EXPECT_EQ(1, dictEntry->NumValues());
+  EXPECT_EQ(utf8("羣輕折軸"), dictEntry->GetDefault());
+
+  auto nowhere = textDict->Match("積羽沉舟衆口鑠金", 24);
+  EXPECT_TRUE(nowhere.IsNull());
+}
+
+TEST_F(TextDictTest, MatchPrefix) {
+  {
+    auto there = textDict->MatchPrefix("清華", 3);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsing"), dictEntry->GetDefault());
+  }
+  {
+    auto there = textDict->MatchPrefix("清華", 5);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsing"), dictEntry->GetDefault());
+  }
+  {
+    auto there = textDict->MatchPrefix("清華", 6);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsinghua"), dictEntry->GetDefault());
+  }
+  {
+    auto there = textDict->MatchPrefix("清華", 100);
+    EXPECT_FALSE(there.IsNull());
+    auto dictEntry = there.Get();
+    EXPECT_EQ(utf8("Tsinghua"), dictEntry->GetDefault());
+  }
+}
+
  } // namespace opencc
diff --git a/src/benchmark/CMakeLists.txt b/src/benchmark/CMakeLists.txt

index a3f1ae7dee7a3537a1c2eb0750e08bcedd172a74..507b2282f74c977e662882f72c802ff1f89caa36 100644 (file)
--- a/src/benchmark/CMakeLists.txt
+++ b/src/benchmark/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(..)
-
  add_executable(performance Performance.cpp)
  target_link_libraries(performance benchmark libopencc)
  add_test(BenchmarkTest performance)
@@ -8,12 +6,12 @@ if (WIN32)
    add_custom_target(
      copy_benchmark
      ${CMAKE_COMMAND} -E copy $<TARGET_FILE:benchmark> ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Copy benchmark"
+    COMMENT "Copying benchmark to src/benchmark"
    )
    add_custom_target(
-    copy_opencc
+    copy_libopencc
      ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libopencc> ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Copy opencc"
+    COMMENT "Copying libopencc to src/benchmark"
    )
-  add_dependencies(performance copy_benchmark copy_opencc)
+  add_dependencies(performance copy_benchmark copy_libopencc)
  endif()
diff --git a/src/benchmark/Performance.cpp b/src/benchmark/Performance.cpp

index cf8d3aa18ce23203a6973d94e742bb9bd359b9d9..d1b646846de297e13d675d46eca9a3f013efc07b 100644 (file)
--- a/src/benchmark/Performance.cpp
+++ b/src/benchmark/Performance.cpp
@@ -1,7 +1,26 @@
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2020-2021 Carbo Kuo <byvoid@byvoid.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
  #include <benchmark/benchmark.h>
  #include <fstream>
  #include <iostream>
  #include <memory>
+#include <sstream>
  #include <streambuf>
  
  #ifdef _MSC_VER
@@ -44,21 +63,32 @@ static void BM_Initialization(benchmark::State& state,
      state.ResumeTiming();
    }
  }
-BENCHMARK_CAPTURE(BM_Initialization, hk2s, "hk2s");
-BENCHMARK_CAPTURE(BM_Initialization, hk2t, "hk2t");
-BENCHMARK_CAPTURE(BM_Initialization, jp2t, "jp2t");
-BENCHMARK_CAPTURE(BM_Initialization, s2hk, "s2hk");
-BENCHMARK_CAPTURE(BM_Initialization, s2t, "s2t");
-BENCHMARK_CAPTURE(BM_Initialization, s2tw, "s2tw");
-BENCHMARK_CAPTURE(BM_Initialization, s2twp, "s2twp");
-BENCHMARK_CAPTURE(BM_Initialization, t2hk, "t2hk");
-BENCHMARK_CAPTURE(BM_Initialization, t2jp, "t2jp");
-BENCHMARK_CAPTURE(BM_Initialization, t2s, "t2s");
-BENCHMARK_CAPTURE(BM_Initialization, tw2s, "tw2s");
-BENCHMARK_CAPTURE(BM_Initialization, tw2sp, "tw2sp");
-BENCHMARK_CAPTURE(BM_Initialization, tw2t, "tw2t");
+BENCHMARK_CAPTURE(BM_Initialization, hk2s, "hk2s")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, hk2t, "hk2t")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, jp2t, "jp2t")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, s2hk, "s2hk")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, s2t, "s2t")->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, s2tw, "s2tw")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, s2twp, "s2twp")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, t2hk, "t2hk")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, t2jp, "t2jp")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, t2s, "t2s")->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, tw2s, "tw2s")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, tw2sp, "tw2sp")
+    ->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Initialization, tw2t, "tw2t")
+    ->Unit(benchmark::kMillisecond);
  
-static void BM_Convert(benchmark::State& state) {
+static void BM_Convert2M(benchmark::State& state) {
    const std::string config_name = "s2t";
    const std::string text = ReadText("zuozhuan.txt");
    const std::unique_ptr<SimpleConverter> converter(Initialize(config_name));
@@ -66,7 +96,24 @@ static void BM_Convert(benchmark::State& state) {
      Convert(converter.get(), text);
    }
  }
-BENCHMARK(BM_Convert)->Unit(benchmark::kMillisecond);
+BENCHMARK(BM_Convert2M)->Unit(benchmark::kMillisecond);
+
+static void BM_Convert(benchmark::State& state, int iteration) {
+  std::ostringstream os;
+  for (int i = 0; i < iteration; i++) {
+    os << "Open Chinese Convert 開放中文轉換" << i << std::endl;
+  }
+  const std::string text = os.str();
+  const std::string config_name = "s2t";
+  const std::unique_ptr<SimpleConverter> converter(Initialize(config_name));
+  for (auto _ : state) {
+    Convert(converter.get(), text);
+  }
+}
+BENCHMARK_CAPTURE(BM_Convert, 100, 100)->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Convert, 1000, 1000)->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Convert, 10000, 10000)->Unit(benchmark::kMillisecond);
+BENCHMARK_CAPTURE(BM_Convert, 100000, 100000)->Unit(benchmark::kMillisecond);
  
  } // namespace opencc
  
diff --git a/src/opencc_config.h.in b/src/opencc_config.h.in

new file mode 100644 (file)

index 0000000..60391d0
--- /dev/null
+++ b/src/opencc_config.h.in
@@ -0,0 +1,21 @@
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2021 Carbo Kuo <byvoid@byvoid.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#cmakedefine OPENCC_ENABLE_DARTS
diff --git a/src/py_opencc.cpp b/src/py_opencc.cpp

index e98b76f0b4d38499ceab996d86752baa6511131b..bcb11b2f9a15d2fb7934e1d24bd5c9a85ff14430 100644 (file)
--- a/src/py_opencc.cpp
+++ b/src/py_opencc.cpp
@@ -1,20 +1,35 @@
-#include <pybind11/pybind11.h>
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2020-2021 Carbo Kuo <byvoid@byvoid.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
  #include "opencc.h"
+#include <pybind11/pybind11.h>
  
  namespace py = pybind11;
  
  PYBIND11_MODULE(opencc_clib, m) {
-    py::class_<opencc::SimpleConverter>(m, "_OpenCC")
-        .def(py::init<const std::string&>())
-        .def(
-            "convert",
-            py::overload_cast<const char*, size_t>
-            (&opencc::SimpleConverter::Convert, py::const_)
-        );
+  py::class_<opencc::SimpleConverter>(m, "_OpenCC")
+      .def(py::init<const std::string&>())
+      .def("convert", py::overload_cast<const char*, size_t>(
+                          &opencc::SimpleConverter::Convert, py::const_));
  
  #ifdef VERSION
-    m.attr("__version__") = VERSION;
+  m.attr("__version__") = VERSION;
  #else
-    m.attr("__version__") = "dev";
+  m.attr("__version__") = "dev";
  #endif
  }
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt

index a1a4cd4c06575a72ef21f8b4f9d6c01a544600d3..373b9cc8ecd1bcf71365720acc2e468a4b4b2b20 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(..)
-
  # Executables
  
  ## opencc
diff --git a/src/tools/CommandLine.cpp b/src/tools/CommandLine.cpp

index 5ba3b9975f11673102e56d235df3d6ba7d671202..b12ab5a3d0b03bce4a68d4fc4f3b05d4ea9a9ef6 100644 (file)
--- a/src/tools/CommandLine.cpp
+++ b/src/tools/CommandLine.cpp
@@ -86,8 +86,30 @@ void Convert(std::string fileName) {
    bool needToRemove = false;
    if (!outputFileName.IsNull() && fileName == outputFileName.Get()) {
      // Special case: input == output
-    const std::string tempFileName = std::tmpnam(nullptr);
      std::ifstream src(fileName, std::ios::binary);
+#ifdef _WIN32
+    const std::string tempFileName = std::tmpnam(nullptr);
+#else
+    // std::tmpnam is deprecated
+    std::string tempFileName;
+    const char* tmpDirEnv = std::getenv("TMPDIR");
+    if (tmpDirEnv != nullptr) {
+      tempFileName = tmpDirEnv;
+    }
+#ifdef P_tmpdir
+    if (tempFileName.empty()) {
+      tempFileName = P_tmpdir;
+    }
+#endif
+    if (tempFileName.empty()) {
+      tempFileName = "/tmp";
+    }
+    tempFileName += "/openccXXXXXX";
+    int fd = mkstemp(const_cast<char*>(tempFileName.c_str()));
+    if (fd == 0) {
+      throw FileNotWritable(tempFileName);
+    }
+#endif
      std::ofstream dst(tempFileName, std::ios::binary);
      dst << src.rdbuf();
      dst.close();
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt

index d365960113e577ef119702629b090bbb77b8a450..e6dc3a76590fde4b05a16a2964dfee5c3443bcfe 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
-include_directories(../deps/libdarts/src)
-include_directories(../src)
+include_directories("${PROJECT_BINARY_DIR}/src")
+include_directories("${PROJECT_SOURCE_DIR}/src")
  
  set(CONFIG_TEST
    config_test/config_test.json
@@ -18,16 +18,18 @@ if (ENABLE_GTEST)
      add_custom_target(
          copy_gtest_to_test
          ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest> ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Copy gtest"
+      COMMENT "Copying gtest to test"
      )
      add_custom_target(
          copy_gtest_main_to_test
          ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gtest_main> ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Copy gtest_main"
+      COMMENT "Copying gtest_main to test"
      )
    endif()
  
-  include_directories(../deps/gtest-1.7.0/include)
+  if(NOT USE_SYSTEM_GTEST)
+    include_directories(../deps/gtest-1.7.0/include)
+  endif()
    set(UNITTESTS
      CommandLineConvertTest
    )
diff --git a/test/CommandLineConvertTest.cpp b/test/CommandLineConvertTest.cpp

index 7281a273de358428a048619027701a3b0b696bc8..6bfd20a8a9c1000049d183ccc5bd548b361c04e0 100644 (file)
--- a/test/CommandLineConvertTest.cpp
+++ b/test/CommandLineConvertTest.cpp
@@ -17,6 +17,7 @@
   */
  
  #include <fstream>
+#include <iostream>
  
  #include "Common.hpp"
  #include "gtest/gtest.h"
@@ -76,6 +77,10 @@ protected:
      return CMAKE_SOURCE_DIR "/data/config/";
    }
  
+  std::string InputFile(const char* config) const {
+    return std::string(InputDirectory()) + config + ".in";
+  }
+
    std::string OutputFile(const char* config) const {
      return std::string(OutputDirectory()) + config + ".out";
    }
@@ -84,10 +89,10 @@ protected:
      return std::string(AnswerDirectory()) + config + ".ans";
    }
  
-  std::string TestCommand(const char* config) const {
-    return OpenccCommand() + std::string("") + " -i " + InputDirectory() +
-           config + ".in" + " -o " + OutputFile(config) + " -c " +
-           ConfigurationDirectory() + config + ".json";
+  std::string TestCommand(const char* config, const std::string& inputFile,
+                          const std::string& outputFile) const {
+    return OpenccCommand() + std::string("") + " -i " + inputFile + " -o " +
+           outputFile + " -c " + ConfigurationDirectory() + config + ".json";
    }
  
    char* originalWorkingDirectory;
@@ -98,15 +103,35 @@ class ConfigurationTest : public CommandLineConvertTest,
  
  TEST_P(ConfigurationTest, Convert) {
    const char* config = GetParam();
-  ASSERT_EQ(0, system(TestCommand(config).c_str()));
-  const std::string& output = GetFileContents(OutputFile(config));
-  const std::string& answer = GetFileContents(AnswerFile(config));
+  const std::string inputFile = InputFile(config);
+  const std::string outputFile = OutputFile(config);
+  ASSERT_EQ(0, system(TestCommand(config, inputFile, outputFile).c_str()));
+  const std::string output = GetFileContents(OutputFile(config));
+  const std::string answer = GetFileContents(AnswerFile(config));
+  ASSERT_EQ(answer, output);
+}
+
+TEST_P(ConfigurationTest, InPlaceConvert) {
+  const char* config = GetParam();
+  // Copy input to output
+  const std::string inputFile = InputFile(config);
+  const std::string outputFile = OutputFile(config);
+  std::ifstream source(inputFile, std::ios::binary);
+  std::ofstream dest(outputFile, std::ios::binary);
+  dest << source.rdbuf();
+  source.close();
+  dest.close();
+  // Test in-place convert (same file)
+  ASSERT_EQ(0, system(TestCommand(config, outputFile, outputFile).c_str()));
+  const std::string output = GetFileContents(OutputFile(config));
+  const std::string answer = GetFileContents(AnswerFile(config));
    ASSERT_EQ(answer, output);
  }
  
-INSTANTIATE_TEST_CASE_P(CommandLine, ConfigurationTest,
-                        ::testing::Values("hk2s", "hk2t", "jp2t", "s2hk", "s2t",
-                                          "s2tw", "s2twp", "t2hk", "t2jp", "t2s",
-                                          "tw2s", "tw2sp", "tw2t"));
+INSTANTIATE_TEST_SUITE_P(CommandLine, ConfigurationTest,
+                         ::testing::Values("hk2s", "hk2t", "jp2t", "s2hk",
+                                           "s2t", "s2tw", "s2twp", "t2hk",
+                                           "t2jp", "t2s", "tw2s", "tw2sp",
+                                           "tw2t"));
  
  } // namespace opencc
diff --git a/test/testcases/s2t.ans b/test/testcases/s2t.ans

index 515de37292cdc71e9736ca47074917e777b3a54b..757df619e02c6039d9582d6143c15054276fa6ca 100644 (file)
--- a/test/testcases/s2t.ans
+++ b/test/testcases/s2t.ans
@@ -5,5 +5,5 @@
  請成相，世之殃，愚闇愚闇墮賢良。人主無賢，如瞽無相何倀倀！請布基，慎聖人，愚而自專事不治。主忌苟勝，羣臣莫諫必逢災。
  曾經有一份真誠的愛情放在我面前，我沒有珍惜，等我失去的時候我才後悔莫及。人事間最痛苦的事莫過於此。如果上天能夠給我一個再來一次得機會，我會對那個女孩子說三個字，我愛你。如果非要在這份愛上加個期限，我希望是，一萬年。
  新的理論被發現了。
-é®\8eé\9aå\92\8cé®\8eé\9aæ\98¯ä¸\80ç¨®ç\94\9fç\89©。
-金胄不是金色的甲冑。
-\ No newline at end of file
+é\87\91è\83\84ä¸\8dæ\98¯é\87\91è\89²ç\9a\84ç\94²å\86\91。
+經理發現後勸諭兩人
+\ No newline at end of file
diff --git a/test/testcases/s2t.in b/test/testcases/s2t.in

index 8e881b782af09062a62448be8348e02b8a1f602b..ce309ae27f1dce35e4bd6e934162d6ee9c78e49c 100644 (file)
--- a/test/testcases/s2t.in
+++ b/test/testcases/s2t.in
@@ -5,5 +5,5 @@
  请成相，世之殃，愚暗愚暗堕贤良。人主无贤，如瞽无相何伥伥！请布基，慎圣人，愚而自专事不治。主忌苟胜，群臣莫谏必逢灾。
  曾经有一份真诚的爱情放在我面前，我没有珍惜，等我失去的时候我才后悔莫及。人事间最痛苦的事莫过于此。如果上天能够给我一个再来一次得机会，我会对那个女孩子说三个字，我爱你。如果非要在这份爱上加个期限，我希望是，一万年。
  新的理论被发现了。
-é²¶é±¼å\92\8cé²\87é±¼æ\98¯ä¸\80ç§\8dç\94\9fç\89©。
-金胄不是金色的甲胄。
-\ No newline at end of file
+é\87\91è\83\84ä¸\8dæ\98¯é\87\91è\89²ç\9a\84ç\94²è\83\84。
+经理发现后劝谕两人
+\ No newline at end of file
diff --git a/test/testcases/s2twp.ans b/test/testcases/s2twp.ans

index 023fc12142187dc3fbcef415acc7c382169d54c3..b0764251a0bc301214852f3c7ede7a61ef14dc90 100644 (file)
--- a/test/testcases/s2twp.ans
+++ b/test/testcases/s2twp.ans
@@ -1,3 +1,4 @@
  滑鼠裡面的矽二極體壞了，導致游標解析度降低。
  我們在寮國的伺服器的硬碟需要使用網際網路演算法軟體解決非同步的問題。
-為什麼你在床裡面睡著？
-\ No newline at end of file
+為什麼你在床裡面睡著？
+海內存知己
+\ No newline at end of file
diff --git a/test/testcases/s2twp.in b/test/testcases/s2twp.in

index 46668e2703173bc9b119e43b171549deadd0320f..cfedb295316bda0b8eec6cf4b94b82f66d6c6436 100644 (file)
--- a/test/testcases/s2twp.in
+++ b/test/testcases/s2twp.in
@@ -1,3 +1,4 @@
  鼠标里面的硅二极管坏了，导致光标分辨率降低。
  我们在老挝的服务器的硬盘需要使用互联网算法软件解决异步的问题。
-为什么你在床里面睡着？
-\ No newline at end of file
+为什么你在床里面睡着？
+海内存知己
+\ No newline at end of file
diff --git a/test/testcases/tw2sp.ans b/test/testcases/tw2sp.ans

index 46668e2703173bc9b119e43b171549deadd0320f..863e0ab8a38296bdc94803bf396c49a2583bac13 100644 (file)
--- a/test/testcases/tw2sp.ans
+++ b/test/testcases/tw2sp.ans
@@ -1,3 +1,5 @@
  鼠标里面的硅二极管坏了，导致光标分辨率降低。
  我们在老挝的服务器的硬盘需要使用互联网算法软件解决异步的问题。
-为什么你在床里面睡着？
-\ No newline at end of file
+为什么你在床里面睡着？
+用鼠标点击正则表达式
+KB大桥也被视为帕劳人的后花园
+\ No newline at end of file
diff --git a/test/testcases/tw2sp.in b/test/testcases/tw2sp.in

index 023fc12142187dc3fbcef415acc7c382169d54c3..9187a36cb8f603d55edf7c863438940ce2b2ed6a 100644 (file)
--- a/test/testcases/tw2sp.in
+++ b/test/testcases/tw2sp.in
@@ -1,3 +1,5 @@
  滑鼠裡面的矽二極體壞了，導致游標解析度降低。
  我們在寮國的伺服器的硬碟需要使用網際網路演算法軟體解決非同步的問題。
-為什麼你在床裡面睡著？
-\ No newline at end of file
+為什麼你在床裡面睡著？
+用滑鼠點選正規表示式
+KB大橋也被視為帛琉人的後花園
+\ No newline at end of file
author	Boyuan Yang <byang@debian.org>
	Sun, 19 Sep 2021 00:16:41 +0000 (20:16 -0400)
committer	Boyuan Yang <byang@debian.org>
	Sun, 19 Sep 2021 00:16:41 +0000 (20:16 -0400)
.appveyor.yml		patch \| blob \| history
.github/workflows/nodejs.yml		patch \| blob \| history
.github/workflows/python.yml	[new file with mode: 0644]	patch \| blob
.github/workflows/pythonpackage.yml	[deleted file]	patch \| blob \| history
.github/workflows/release-pypi.yml	[new file with mode: 0644]	patch \| blob
.npmignore		patch \| blob \| history
.travis.yml		patch \| blob \| history
BUILD.md	[deleted file]	patch \| blob \| history
CMakeLists.txt		patch \| blob \| history
NEWS.md		patch \| blob \| history
README.md		patch \| blob \| history
bdist_array.bash	[deleted file]	patch \| blob \| history
bdist_array.cmd	[deleted file]	patch \| blob \| history
data/CMakeLists.txt		patch \| blob \| history
data/dictionary/HKVariants.txt		patch \| blob \| history
data/dictionary/JPVariants.txt		patch \| blob \| history
data/dictionary/STCharacters.txt		patch \| blob \| history
data/dictionary/STPhrases.txt		patch \| blob \| history
data/dictionary/TSCharacters.txt		patch \| blob \| history
data/dictionary/TSPhrases.txt		patch \| blob \| history
data/dictionary/TWPhrasesIT.txt		patch \| blob \| history
data/dictionary/TWPhrasesName.txt		patch \| blob \| history
data/dictionary/TWPhrasesOther.txt		patch \| blob \| history
data/dictionary/TWVariants.txt		patch \| blob \| history
data/scheme/st_multi.txt		patch \| blob \| history
node/global.gypi		patch \| blob \| history
node/node_opencc.gypi		patch \| blob \| history
node/opencc_config.h	[new file with mode: 0644]	patch \| blob
package-lock.json		patch \| blob \| history
package.json		patch \| blob \| history
python/Dockerfile.posix	[deleted file]	patch \| blob \| history
release-pypi-linux.sh	[new file with mode: 0644]	patch \| blob
release-pypi-macos.sh	[new file with mode: 0644]	patch \| blob
release-pypi-windows.cmd	[new file with mode: 0644]	patch \| blob
src/BinaryDict.cpp		patch \| blob \| history
src/CMakeLists.txt		patch \| blob \| history
src/Common.hpp		patch \| blob \| history
src/Config.cpp		patch \| blob \| history
src/ConversionChainTest.cpp		patch \| blob \| history
src/DartsDict.cpp		patch \| blob \| history
src/DartsDictTest.cpp		patch \| blob \| history
src/Dict.hpp		patch \| blob \| history
src/DictGroup.cpp		patch \| blob \| history
src/DictGroupTest.cpp		patch \| blob \| history
src/Lexicon.cpp		patch \| blob \| history
src/Lexicon.hpp		patch \| blob \| history
src/MarisaDict.cpp		patch \| blob \| history
src/MarisaDictTest.cpp		patch \| blob \| history
src/PhraseExtract.cpp		patch \| blob \| history
src/SimpleConverter.hpp		patch \| blob \| history
src/TextDict.cpp		patch \| blob \| history
src/TextDictTest.cpp		patch \| blob \| history
src/benchmark/CMakeLists.txt		patch \| blob \| history
src/benchmark/Performance.cpp		patch \| blob \| history
src/opencc_config.h.in	[new file with mode: 0644]	patch \| blob
src/py_opencc.cpp		patch \| blob \| history
src/tools/CMakeLists.txt		patch \| blob \| history
src/tools/CommandLine.cpp		patch \| blob \| history
test/CMakeLists.txt		patch \| blob \| history
test/CommandLineConvertTest.cpp		patch \| blob \| history
test/testcases/s2t.ans		patch \| blob \| history
test/testcases/s2t.in		patch \| blob \| history
test/testcases/s2twp.ans		patch \| blob \| history
test/testcases/s2twp.in		patch \| blob \| history
test/testcases/tw2sp.ans		patch \| blob \| history
test/testcases/tw2sp.in		patch \| blob \| history